greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: closed values test

pull/11311/head
Tienson Qin 2024-05-08 00:50:06 +08:00
parent 976e5c2f6b
commit 55bc527df5
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/frontend/handler/db_based/property.cljs
View File

@ -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)

8
src/test/frontend/handler/db_based/property_closed_value_test.cljs
View File

@ -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

2
src/test/frontend/modules/outliner/core_test.cljs
View File

@ -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]]]