Browse Source

fix: graph parser tests

Tienson Qin 1 year ago
parent
commit
15e3ce9858

+ 2 - 1
deps/db/.carve/config.edn

@@ -13,5 +13,6 @@
                   logseq.db.frontend.schema
                   logseq.db.frontend.validate
                   logseq.db.test.helper
-                  logseq.db]
+                  logseq.db
+                  logseq.db.frontend.property.type]
  :report {:format :ignore}}

+ 8 - 2
deps/graph-parser/test/logseq/graph_parser/exporter_test.cljs

@@ -43,17 +43,23 @@
               db)
          first)))
 
+(defn- extract-rules
+  [rules]
+  (rules/extract-rules rules/db-query-dsl-rules
+                       rules
+                       {:deps rules/rules-dependencies}))
+
 (defn- find-block-by-property [db property]
   (d/q '[:find [(pull ?b [*]) ...]
          :in $ ?prop %
          :where (has-property ?b ?prop)]
-       db property (rules/extract-rules rules/db-query-dsl-rules [:has-property])))
+       db property (extract-rules [:has-property])))
 
 (defn- find-block-by-property-value [db property property-value]
   (->> (d/q '[:find [(pull ?b [*]) ...]
               :in $ ?prop ?prop-value %
               :where (property ?b ?prop ?prop-value)]
-            db property property-value (rules/extract-rules rules/db-query-dsl-rules [:property]))
+            db property property-value (extract-rules [:property]))
        first))
 
 (defn- find-page-by-name [db name]

+ 7 - 7
src/test/frontend/db/query_dsl_test.cljs

@@ -148,9 +148,9 @@ prop-d:: [[nada]]"}])
               (dsl-query "(property prop-d no-space-link)")))
       "Blocks have property value with no space")
 
-  (is (= ["b3" "b4"]
-         (map (comp first str/split-lines :block/title)
-              (dsl-query "(property prop-d)")))
+  (is (= #{"b3" "b4"}
+         (set (map (comp first str/split-lines :block/title)
+                   (dsl-query "(property prop-d)"))))
       "Blocks that have a property"))
 
 (deftest block-property-queries
@@ -264,10 +264,10 @@ prop-d:: [[nada]]"}])
         "Boolean false")))
 
 (when-not js/process.env.DB_GRAPH
- (deftest page-property-queries
-   (testing "page property tests with default config"
-     (test-helper/with-config {}
-       (page-property-queries-test)))))
+  (deftest page-property-queries
+    (testing "page property tests with default config"
+      (test-helper/with-config {}
+        (page-property-queries-test)))))
 
 (deftest task-queries
   (load-test-files [{:file/path "pages/page1.md"