feat(encryption): revert async back for tests

src/test/frontend/db/model_test.cljs

@@ -5,77 +5,71 @@
             [frontend.db-schema :as schema]
             [frontend.handler.repo :as repo-handler]
             [promesa.core :as p]
-            [cljs.test :refer [deftest is are testing use-fixtures async]]))
+            [cljs.test :refer [deftest is are testing use-fixtures]]))
 
 (deftest test-page-alias-with-multiple-alias
   []
-  (async done
-    (p/let [files [{:file/path "a.md"
-                    :file/content "---\ntitle: a\nalias: b, c\n---"}
-                  {:file/path "b.md"
-                    :file/content "---\ntitle: b\nalias: a, d\n---"}
-                  {:file/path "e.md"
-                    :file/content "---\ntitle: e\n---\n## ref to [[b]]"}]
-            _ (-> (repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false})
-                  (p/catch (fn [] "ignore indexedDB error")))
-            a-aliases (model/page-alias-set test-db "a")
-            b-aliases (model/page-alias-set test-db "b")
-            alias-names (model/get-page-alias-names test-db "a")
-            b-ref-blocks (model/get-page-referenced-blocks test-db "b")
-            a-ref-blocks (model/get-page-referenced-blocks test-db "a")]
-      (are [x y] (= x y)
-        4 (count a-aliases)
-        4 (count b-aliases)
-        1 (count b-ref-blocks)
-        1 (count a-ref-blocks)
-        (set ["b" "c" "d"]) (set alias-names))
-      (done))))
+  (p/let [files [{:file/path "a.md"
+                  :file/content "---\ntitle: a\nalias: b, c\n---"}
+                 {:file/path "b.md"
+                  :file/content "---\ntitle: b\nalias: a, d\n---"}
+                 {:file/path "e.md"
+                  :file/content "---\ntitle: e\n---\n## ref to [[b]]"}]
+          _ (-> (repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false})
+                (p/catch (fn [] "ignore indexedDB error")))
+          a-aliases (model/page-alias-set test-db "a")
+          b-aliases (model/page-alias-set test-db "b")
+          alias-names (model/get-page-alias-names test-db "a")
+          b-ref-blocks (model/get-page-referenced-blocks test-db "b")
+          a-ref-blocks (model/get-page-referenced-blocks test-db "a")]
+    (are [x y] (= x y)
+      4 (count a-aliases)
+      4 (count b-aliases)
+      1 (count b-ref-blocks)
+      1 (count a-ref-blocks)
+      (set ["b" "c" "d"]) (set alias-names))))
 
 (deftest test-page-alias-set
   []
-  (async done
-    (p/let [files [{:file/path "a.md"
-                    :file/content "---\ntitle: a\nalias: [[b]]\n---"}
-                  {:file/path "b.md"
-                    :file/content "---\ntitle: b\nalias: [[c]]\n---"}
-                  {:file/path "d.md"
-                    :file/content "---\ntitle: d\n---\n## ref to [[b]]"}]
-            _ (-> (repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false})
-                  (p/catch (fn [] "ignore indexedDB error")))
-            a-aliases (model/page-alias-set test-db "a")
-            b-aliases (model/page-alias-set test-db "b")
-            alias-names (model/get-page-alias-names test-db "a")
-            b-ref-blocks (model/get-page-referenced-blocks test-db "b")
-            a-ref-blocks (model/get-page-referenced-blocks test-db "a")]
-      (are [x y] (= x y)
-        3 (count a-aliases)
-        1 (count b-ref-blocks)
-        1 (count a-ref-blocks)
-        (set ["b" "c"]) (set alias-names))
-      (done))))
+  (p/let [files [{:file/path "a.md"
+                  :file/content "---\ntitle: a\nalias: [[b]]\n---"}
+                 {:file/path "b.md"
+                  :file/content "---\ntitle: b\nalias: [[c]]\n---"}
+                 {:file/path "d.md"
+                  :file/content "---\ntitle: d\n---\n## ref to [[b]]"}]
+          _ (-> (repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false})
+                (p/catch (fn [] "ignore indexedDB error")))
+          a-aliases (model/page-alias-set test-db "a")
+          b-aliases (model/page-alias-set test-db "b")
+          alias-names (model/get-page-alias-names test-db "a")
+          b-ref-blocks (model/get-page-referenced-blocks test-db "b")
+          a-ref-blocks (model/get-page-referenced-blocks test-db "a")]
+    (are [x y] (= x y)
+      3 (count a-aliases)
+      1 (count b-ref-blocks)
+      1 (count a-ref-blocks)
+      (set ["b" "c"]) (set alias-names))))
 
 (deftest test-page-alias-without-brackets
   []
-  (async done
-    (p/let [files [{:file/path "a.md"
-                    :file/content "---\ntitle: a\nalias: b\n---"}
-                  {:file/path "b.md"
-                    :file/content "---\ntitle: b\nalias: c\n---"}
-                  {:file/path "d.md"
-                    :file/content "---\ntitle: d\n---\n## ref to [[b]]"}]
-            _ (-> (repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false})
-                  (p/catch (fn [] "ignore indexedDB error")))
-            a-aliases (model/page-alias-set test-db "a")
-            b-aliases (model/page-alias-set test-db "b")
-            alias-names (model/get-page-alias-names test-db "a")
-            b-ref-blocks (model/get-page-referenced-blocks test-db "b")
-            a-ref-blocks (model/get-page-referenced-blocks test-db "a")]
-      (are [x y] (= x y)
-        3 (count a-aliases)
-        1 (count b-ref-blocks)
-        1 (count a-ref-blocks)
-        (set ["b" "c"]) (set alias-names))
-      (done))))
+  (p/let [files [{:file/path "a.md"
+                  :file/content "---\ntitle: a\nalias: b\n---"}
+                 {:file/path "b.md"
+                  :file/content "---\ntitle: b\nalias: c\n---"}
+                 {:file/path "d.md"
+                  :file/content "---\ntitle: d\n---\n## ref to [[b]]"}]
+          _ (-> (repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false})
+                (p/catch (fn [] "ignore indexedDB error")))
+          a-aliases (model/page-alias-set test-db "a")
+          b-aliases (model/page-alias-set test-db "b")
+          alias-names (model/get-page-alias-names test-db "a")
+          b-ref-blocks (model/get-page-referenced-blocks test-db "b")
+          a-ref-blocks (model/get-page-referenced-blocks test-db "a")]
+    (are [x y] (= x y)
+      3 (count a-aliases)
+      1 (count b-ref-blocks)
+      1 (count a-ref-blocks)
+      (set ["b" "c"]) (set alias-names))))
 
 (use-fixtures :each
   {:before config/start-test-db!

src/test/frontend/db/query_dsl_test.cljs

@@ -7,7 +7,7 @@
             [frontend.db-schema :as schema]
             [frontend.handler.repo :as repo-handler]
             [promesa.core :as p]
-            [cljs.test :refer [deftest is are testing use-fixtures async]]))
+            [cljs.test :refer [deftest is are testing use-fixtures]]))
 
 ;; TODO: quickcheck
 ;; 1. generate query filters
@@ -94,9 +94,7 @@ parent: child page 2
 :last_modified_at: 1609084800002
 :END:
 "}]]
-    (async done
-      (-> (p/then (repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false}) done)
-          (p/catch #(done))))))
+    (repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false})))
 
 (def parse (partial dsl/parse test-db))