fix: rename tests broken by last rename change

also move to more appropriate ns

src/test/frontend/handler/db_based/page_test.cljs → src/test/frontend/worker/handler/page/rename_test.cljs

@@ -1,12 +1,12 @@
-(ns frontend.handler.db-based.page-test
+(ns frontend.worker.handler.page.rename-test
   (:require [clojure.test :refer [deftest is testing use-fixtures]]
             [frontend.test.helper :as test-helper]
             [datascript.core :as d]
             [frontend.handler.page :as page-handler]
             [frontend.db :as db]
             [frontend.worker.db.fix :as db-fix]
-            [frontend.handler.editor :as editor-handler]
-            [goog.dom :as gdom]))
+            [frontend.worker.handler.page.rename :as worker-page-rename]
+            [frontend.handler.editor :as editor-handler]))
 
 ;; FIXME: merge properties from both pages
 
@@ -24,10 +24,13 @@
 
 (use-fixtures :each start-and-destroy-db)
 
+(defn- page-rename [old-name new-name]
+  (worker-page-rename/rename! repo (db/get-db repo false) {} old-name new-name))
+
 (deftest rename-test
   (testing "Case change"
     (let [page (db/entity [:block/name "test"])]
-      (page-handler/rename! "test" "Test")
+      (page-rename "test" "Test")
       (let [entity (db/entity [:block/name "test"])]
         (is (= "Test" (:block/original-name entity)))
         ;; db id not changed
@@ -35,28 +38,26 @@
 
   (testing "Name changed"
     (let [page (db/entity [:block/name "test"])]
-      (page-handler/rename! "Test" "New name")
+      (page-rename "Test" "New name")
       (let [entity (db/entity [:block/name "new name"])]
         (is (= "New name" (:block/original-name entity)))
         (is (= (:db/id page) (:db/id entity))))))
 
   (testing "Merge existing page"
-    (with-redefs [gdom/getElement (constantly #js {:id nil})
-                  editor-handler/edit-block! (constantly nil)]
-      (page-handler/create! "Existing page" {:redirect? false :create-first-block? true})
-      (page-handler/rename! "New name" "Existing page")
-      (let [e1 (db/entity [:block/name "new name"])
-            e2 (db/entity [:block/name "existing page"])]
+    (page-handler/create! "Existing page" {:redirect? false :create-first-block? true})
+    (page-rename "New name" "Existing page")
+    (let [e1 (db/entity [:block/name "new name"])
+          e2 (db/entity [:block/name "existing page"])]
       ;; Old page deleted
-        (is (nil? e1))
+      (is (nil? e1))
       ;; Blocks from both pages have been merged
-        (is (= (count (:block/_page e2)) (+ 1 (dec (count init-data)))))
+      (is (= (count (:block/_page e2)) (+ 1 (dec (count init-data)))))
       ;; Ensure there's no conflicts
-        (is (empty? (db-fix/get-conflicts (db/get-db) (:db/id e2))))))))
+      (is (empty? (db-fix/get-conflicts (db/get-db) (:db/id e2)))))))
 
 (deftest merge-with-empty-page
   (page-handler/create! "Existing page" {:redirect? false :create-first-block? false})
-  (page-handler/rename! "Test" "Existing page")
+  (page-rename "Test" "Existing page")
   (let [e1 (db/entity [:block/name "test"])
         e2 (db/entity [:block/name "existing page"])]
       ;; Old page deleted
@@ -70,31 +71,29 @@
   (testing "Renaming a page to an existing whiteboard page"
     (page-handler/create! "Whiteboard page" {:redirect? false
                                              :whiteboard? true})
-    (is (= :merge-whiteboard-pages (page-handler/rename! "Test" "Whiteboard page" false false)))
-    (is (= :merge-whiteboard-pages (page-handler/rename! "Whiteboard page" "Test" false false)))))
+    (is (= :merge-whiteboard-pages (page-rename "Test" "Whiteboard page")))
+    (is (= :merge-whiteboard-pages (page-rename "Whiteboard page" "Test")))))
 
 (deftest merge-existing-pages-should-update-ref-ids
   (testing "Merge existing page"
-    (with-redefs [gdom/getElement (constantly #js {:id nil})
-                  editor-handler/edit-block! (constantly nil)]
-      (editor-handler/save-block! repo fbid "Block 1 [[Test]]")
-      (page-handler/create! "Existing page" {:redirect? false :create-first-block? true})
-      (page-handler/rename! "Test" "Existing page" false false)
-      (let [e1 (db/entity [:block/name "test"])
-            e2 (db/entity [:block/name "existing page"])]
+    (editor-handler/save-block! repo fbid "Block 1 [[Test]]")
+    (page-handler/create! "Existing page" {:redirect? false :create-first-block? true})
+    (page-rename "Test" "Existing page")
+    (let [e1 (db/entity [:block/name "test"])
+          e2 (db/entity [:block/name "existing page"])]
       ;; Old page deleted
-        (is (nil? e1))
+      (is (nil? e1))
       ;; Blocks from both pages have been merged
-        (is (= (count (:block/_page e2)) (+ 1 (dec (count init-data)))))
+      (is (= (count (:block/_page e2)) (+ 1 (dec (count init-data)))))
       ;; Ensure there's no conflicts
-        (is (empty? (db-fix/get-conflicts (db/get-db) (:db/id e2))))
+      (is (empty? (db-fix/get-conflicts (db/get-db) (:db/id e2))))
       ;; Content updated
-        (is (= "Block 1 [[Existing page]]" (:block/content (db/entity [:block/uuid fbid]))))))))
+      (is (= "Block 1 [[Existing page]]" (:block/content (db/entity [:block/uuid fbid])))))))
 
 ;; TODO: full coverage
 (deftest rename-namespace-pages
   (testing "Rename a page to a namespaced one"
-    (page-handler/rename! "Test" "Abc/Def Ghi/Jk" {})
+    (page-rename "Test" "Abc/Def Ghi/Jk")
     (let [e1 (db/entity [:block/name "test"])
           e2 (db/entity [:block/name "abc/def ghi/jk"])
           e3 (db/entity [:block/name "abc/def ghi"])