Przeglądaj źródła

fix: closed values test

Tienson Qin 1 rok temu
rodzic
commit
55bc527df5

+ 4 - 3
src/main/frontend/handler/db_based/property.cljs

@@ -572,9 +572,10 @@
                                 (get-property-value-schema property-type property {:new-closed-value? true})
                                 resolved-value)]
         (cond
-          (some (fn [b] (and (= resolved-value (or (db-pu/property-value-when-closed b)
-                                                   (:block/uuid b)))
-                             (not= id (:block/uuid b)))) closed-values)
+          (some (fn [b]
+                  (and (= (str resolved-value) (str (or (db-pu/property-value-when-closed b)
+                                                        (:block/uuid b))))
+                       (not= id (:block/uuid b)))) closed-values)
           (do
             (notification/show! "Choice already exists" :warning)
             :value-exists)

+ 4 - 4
src/test/frontend/handler/db_based/property_closed_value_test.cljs

@@ -49,14 +49,14 @@
        (testing "Add existing values to closed values"
          (let [values (get-value-ids k)]
            (is (every? uuid? values))
-           (is (= #{1 2} (get-closed-values values)))
+           (is (= #{"1" "2"} (get-closed-values values)))
            (is (every? #(contains? (:block/type (db/entity [:block/uuid %])) "closed value")
                        values))))
        (testing "Add non-numbers shouldn't work"
          (p/let [result (db-property-handler/<upsert-closed-value property {:value "not a number"})]
            (is (= result :value-invalid))
            (let [values (get-value-ids k)]
-             (is (= #{1 2} (get-closed-values values))))))
+             (is (= #{"1" "2"} (get-closed-values values))))))
 
        (testing "Add existing value"
          (p/let [result (db-property-handler/<upsert-closed-value property {:value 2})]
@@ -66,10 +66,10 @@
          (p/let [{:keys [block-id tx-data]} (db-property-handler/<upsert-closed-value property {:value 3})]
            (db/transact! tx-data)
            (let [b (db/entity [:block/uuid block-id])]
-             (is (= 3 (:block/content b)))
+             (is (= "3" (:block/content b)))
              (is (contains? (:block/type b) "closed value"))
              (let [values (get-value-ids k)]
-               (is (= #{1 2 3} (get-closed-values values))))
+               (is (= #{"1" "2" "3"} (get-closed-values values))))
 
              (testing "Update closed value"
                (p/let [{:keys [tx-data]} (db-property-handler/<upsert-closed-value property {:id block-id

+ 1 - 1
src/test/frontend/modules/outliner/core_test.cljs

@@ -223,7 +223,7 @@
     (is (= [2 3 6 5 7] (get-children 22)))))
 
 (deftest ^:fix-me test-move-non-consecutive-blocks-2
-  (testing "Move 3 as sibling of 2."
+  (testing "Move 3 and 5 as children of 2."
     (transact-tree! [[22 [[2 [[3]
                               [4]
                               [5]]]