diff --git a/src/test/grub/test/integration/synchronization.clj b/src/test/grub/test/integration/synchronization.clj index a0c2dea..3ab461b 100644 --- a/src/test/grub/test/integration/synchronization.clj +++ b/src/test/grub/test/integration/synchronization.clj @@ -72,7 +72,7 @@ :recipes {}}]) server (atom [{:tag 44 :grubs {"1" {:text "2 apples" :completed false}} :recipes {}}]) - {:keys [new-client-states]} (client-server client server) + {:keys [new-client-states new-server-states]} (client-server client server) client-change {:tag 2 :grubs {"1" {:text "2 apples" :completed true}} :recipes {}} @@ -84,6 +84,7 @@ (swap! server conj server-change) (>!! new-client-states client-change) (short-delay) + (>!! new-server-states (last @server)) (states-in-sync? @client @server) => true (last-state @client) => {:grubs {"1" {:text "2 apples" :completed true} "2" {:text "milk" :completed false}} diff --git a/src/test/grub/test/unit/sync.clj b/src/test/grub/test/unit/sync.clj index 8e3e0c1..2c69617 100644 --- a/src/test/grub/test/unit/sync.clj +++ b/src/test/grub/test/unit/sync.clj @@ -29,7 +29,7 @@ :grubs {"1" {:completed true, :text "2 apples"}} :recipes {}})) - (fact "Diff, server changes - Apply diff, return changes" + (fact "Diff, server changes - Apply diff, don't return changes (now)" (let [states (atom [{:tag 0 :grubs {"1" {:text "2 apples" :completed false}} :recipes {}} {:tag 1 :grubs {"1" {:text "2 apples" :completed false} "2" {:text "3 onions" :completed false}} @@ -49,12 +49,7 @@ "2" {:text "3 onions" :completed false}} :recipes {}} {:tag 2 :grubs {"1" {:text "2 apples" :completed true} "2" {:text "3 onions" :completed false}} :recipes {}}) - out-event => - (just {:type :diff - :shadow-tag 4 - :tag 2 - :diff {:grubs {:- #{} :+ {"2" {:completed false, :text "3 onions"}}} - :recipes {:- #{}, :+ nil}}}) + out-event => nil new-shadow => {:tag 4 :grubs {"1" {:text "2 apples" :completed true}} :recipes {}}))