Browse Source

chore: update docs integration tests to use latest released docs version

Gabriel Horner 1 year ago
parent
commit
f2ecca08d9

+ 1 - 1
deps/graph-parser/.gitignore

@@ -1,3 +1,3 @@
 /.clj-kondo/.cache
 cljs-test-runner-out
-/test/docs*
+/test/resources/docs*

+ 18 - 19
deps/graph-parser/src/logseq/graph_parser/test/docs_graph_helper.cljs

@@ -97,7 +97,7 @@
            (get-journal-page-count db))
         "Journal page count on disk equals count in db")
 
-    (is (= {"CANCELED" 2 "DONE" 6 "LATER" 4 "NOW" 5 "TODO" 22}
+    (is (= {"CANCELED" 2 "DONE" 6 "LATER" 4 "NOW" 5 "WAIT" 1 "IN-PROGRESS" 1 "CANCELLED" 1 "TODO" 19}
            (->> (d/q '[:find (pull ?b [*]) :where [?b :block/marker]]
                      db)
                 (map first)
@@ -106,30 +106,30 @@
                 (into {})))
         "Task marker counts")
 
-    (is (= {:markdown 6080 :org 500} (get-block-format-counts db))
+    (is (= {:markdown 7325 :org 500} (get-block-format-counts db))
         "Block format counts")
 
-    (is (= {:description 81, :updated-at 46, :tags 5,
-            :logseq.tldraw.shape 79, :card-last-score 6, :card-repeats 6,
-            :card-next-schedule 6, :ls-type 79, :card-last-interval 6, :type 107,
-            :template 5, :title 114, :alias 41, :supports 5, :id 145, :url 5,
-            :card-ease-factor 6, :created-at 46,
-            :card-last-reviewed 6, :platforms 51, :initial-version 8, :heading 226
-            :logseq.macro-arguments 109, :logseq.macro-name 109}
+    (is (= {:rangeincludes 13, :description 137, :updated-at 46, :tags 5,
+            :logseq.order-list-type 16, :query-table 8, :logseq.macro-arguments 105,
+            :parent 14, :logseq.tldraw.shape 79, :card-last-score 5, :card-repeats 5,
+            :name 16, :card-next-schedule 5, :ls-type 79, :card-last-interval 5, :type 166,
+            :template 5, :domainincludes 7, :title 114, :alias 62, :supports 6, :id 145,
+            :url 30, :card-ease-factor 5, :logseq.macro-name 105, :created-at 46,
+            :card-last-reviewed 5, :platforms 79, :initial-version 16, :heading 315}
            (get-top-block-properties db))
         "Counts for top block properties")
 
-    (is (= {:description 77, :tags 5, :permalink 1, :ls-type 1, :type 104,
-            :related 1, :source 1, :title 113, :author 1, :sample 1, :alias 41,
-            :logseq.tldraw.page 1, :supports 5, :url 5, :platforms 50,
-            :initial-version 7, :full-title 1}
+    (is (= {:rangeincludes 13, :description 117, :tags 5, :unique 2, :meta 2, :parent 14,
+            :ls-type 1, :type 147, :source 1, :domainincludes 7, :sameas 4, :title 113, :author 1,
+            :alias 62, :logseq.tldraw.page 1, :supports 6, :url 30, :platforms 78,
+            :initial-version 15, :full-title 1}
            (get-all-page-properties db))
         "Counts for all page properties")
 
     (is (= {:block/scheduled 2
             :block/priority 4
             :block/deadline 1
-            :block/collapsed? 80
+            :block/collapsed? 90
             :block/repeated? 1}
            (get-counts-for-common-attributes db))
         "Counts for blocks with common block attributes")
@@ -141,9 +141,8 @@
           all-namespaces (->> (d/q '[:find (pull ?n [*]) :where [?b :block/namespace ?n]] db)
                               (map (comp :block/original-name first))
                               set)]
-      (is (= #{"term" "setting" "book" "templates" "Query table" "page"
-               "Whiteboard" "Whiteboard/Tool" "Whiteboard/Tool/Shape" "Whiteboard/Object"
-               "Whiteboard/Property" "Community" "Tweet"}
+      (is (= #{"term" "setting" "book" "templates" "page" "Community" "Tweet"
+               "Whiteboard" "Whiteboard/Tool" "Whiteboard/Tool/Shape" "Whiteboard/Object" "Whiteboard/Action Bar"}
              all-namespaces)
           (str "Has correct namespaces: " no-name)))
 
@@ -161,8 +160,8 @@
   ;; Counts assertions help check for no major regressions. These counts should
   ;; only increase over time as the docs graph rarely has deletions
   (testing "Counts"
-    (is (= 303 (count files)) "Correct file count")
-    (is (= 23
+    (is (= 340 (count files)) "Correct file count")
+    (is (= 33
            (ffirst
             (d/q '[:find (count ?b)
                    :where [?b :block/content ?content]

+ 3 - 3
deps/graph-parser/test/logseq/graph_parser/cli_test.cljs

@@ -25,14 +25,14 @@
 
 ;; Integration test that test parsing a large graph like docs
 (deftest ^:integration parse-graph
-  (let [graph-dir "test/docs-0.9.2"
-        _ (docs-graph-helper/clone-docs-repo-if-not-exists graph-dir "v0.9.2")
+  (let [graph-dir "test/resources/docs-0.10.9"
+        _ (docs-graph-helper/clone-docs-repo-if-not-exists graph-dir "v0.10.9")
         {:keys [conn files asts]} (gp-cli/parse-graph graph-dir {:verbose false})]
 
     (docs-graph-helper/docs-graph-assertions @conn graph-dir files)
 
     (testing "Additional counts"
-      (is (= 48767 (count (d/datoms @conn :eavt))) "Correct datoms count"))
+      (is (= 58051 (count (d/datoms @conn :eavt))) "Correct datoms count"))
 
     (testing "Asts"
       (is (seq asts) "Asts returned are non-zero")

+ 12 - 12
deps/graph-parser/test/logseq/graph_parser/mldoc_test.cljs

@@ -138,8 +138,8 @@ line 4"]
     
 
 (deftest ^:integration test->edn
-  (let [graph-dir "test/docs-0.9.2"
-        _ (docs-graph-helper/clone-docs-repo-if-not-exists graph-dir "v0.9.2")
+  (let [graph-dir "test/resources/docs-0.10.9"
+        _ (docs-graph-helper/clone-docs-repo-if-not-exists graph-dir "v0.10.9")
         files (#'gp-cli/build-graph-files graph-dir {})
         asts-by-file (->> files
                           (map (fn [{:file/keys [path content]}]
@@ -149,20 +149,20 @@ line 4"]
                                     (gp-mldoc/->edn content
                                                     (gp-mldoc/default-config format))])))
                           (into {}))]
-    (is (= {"Custom" 50,
-            "Displayed_Math" 1,
+    (is (= {"Custom" 62,
+            "Displayed_Math" 2,
             "Drawer" 1,
-            "Example" 20,
+            "Example" 22,
             "Footnote_Definition" 2,
-            "Heading" 5648,
+            "Heading" 6716,
             "Hiccup" 9,
-            "List" 22,
-            "Paragraph" 571,
-            "Properties" 87,
-            "Property_Drawer" 423,
-            "Quote" 24,
+            "List" 25,
+            "Paragraph" 626,
+            "Properties" 85,
+            "Property_Drawer" 509,
+            "Quote" 28,
             "Raw_Html" 18,
-            "Src" 79,
+            "Src" 82,
             "Table" 8}
            (->> asts-by-file (mapcat val) (map ffirst) frequencies))
         "AST node type counts")))

+ 4 - 4
src/test/frontend/handler/repo_test.cljs

@@ -15,8 +15,8 @@
 (use-fixtures :each test-helper/start-and-destroy-db)
 
 (deftest ^:integration parse-and-load-files-to-db
-  (let [graph-dir "src/test/docs-0.9.2"
-        _ (docs-graph-helper/clone-docs-repo-if-not-exists graph-dir "v0.9.2")
+  (let [graph-dir "src/test/docs-0.10.9"
+        _ (docs-graph-helper/clone-docs-repo-if-not-exists graph-dir "v0.10.9")
         repo-config (edn/read-string (str (fs/readFileSync (node-path/join graph-dir "logseq/config.edn"))))
         files (#'gp-cli/build-graph-files graph-dir repo-config)
         _ (test-helper/with-config repo-config
@@ -25,9 +25,9 @@
 
     (docs-graph-helper/docs-graph-assertions db graph-dir (map :file/path files))
     (testing "Additional Counts"
-      (is (= 64477 (count (d/datoms db :eavt))) "Correct datoms count")
+      (is (= 77137 (count (d/datoms db :eavt))) "Correct datoms count")
 
-      (is (= 5946
+      (is (= 7047
              (ffirst
               (d/q '[:find (count ?b)
                      :where [?b :block/path-refs ?bp] [?bp :block/name]] db)))