Fix non passing cljs tests

There’s an issue with `rcf/with`. Ticket: https://www.notion.so/hyperfiddle/cljs-rcf-with-calls-dispose-fn-too-soon-7db48977cd78464abce7dff0cc5e15e3
behrica · Jun 30, 2022 · 060a8f6 · 060a8f6
1 parent bf6acad
commit 060a8f6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -17,15 +17,15 @@
                        :modules       {:main {:entries [user]}}}
             :test     {:target           :node-test
                        :output-to        "out/node-tests.js"
-                       :ns-regexp        "^hyperfiddle.(photon-[^dom]|core-async).*$"
+                       :ns-regexp        "^hyperfiddle.(photon-[^dom]|core-async|zero).*$"
                        :build-options    {:cache-level :off}
-                       :modules          {:main {:entries [hyperfiddle.photon hyperfiddle.photon-test #_hyperfiddle.missionary-test hyperfiddle.core-async-test]}}
+                       :modules          {:main {:entries [hyperfiddle.zero hyperfiddle.photon hyperfiddle.photon-test #_hyperfiddle.missionary-test hyperfiddle.core-async-test]}}
                        :dev              {:closure-defines {hyperfiddle.logger/LEVEL "debug"}}
                        :compiler-options {:warnings {:redef-in-file false}}}
             :browser-test {:target           :karma
                            :output-to        "out/karma-tests.js"
-                           :ns-regexp        "^hyperfiddle.(photon-[^dom]|core-async).*$"
+                           :ns-regexp        "^hyperfiddle.(photon-[^dom]|core-async|zero).*$"
                            :build-options    {:cache-level :off}
-                           :modules          {:main {:entries [hyperfiddle.photon hyperfiddle.photon-test #_hyperfiddle.missionary-test hyperfiddle.core-async-test]}}
+                           :modules          {:main {:entries [hyperfiddle.zero hyperfiddle.photon hyperfiddle.photon-test #_hyperfiddle.missionary-test hyperfiddle.core-async-test]}}
                            :dev              {:closure-defines {hyperfiddle.logger/LEVEL "debug"}}
                            :compiler-options {:warnings {:redef-in-file false}}}}}
diff --git a/src/hyperfiddle/photon_ui.cljc b/src/hyperfiddle/photon_ui.cljc
@@ -153,10 +153,10 @@
 (tests
   (def !event (atom nil))
   (def !input (atom 0))
-  (with (p/run (semicontroller :switch/set (new (m/watch !input))
-                 (p/fn [input]
-                   (! input)
-                   (p/watch !event))))
+  (let [dispose (p/run (semicontroller :switch/set (new (m/watch !input))
+                         (p/fn [input]
+                           (! input)
+                           (p/watch !event))))]
     % := 0
     (swap! !input inc)
     % := 1
@@ -166,7 +166,8 @@
     (rcf/set-timeout! 1200) ;; rcf issue, extend timeout
     (reset! !event {:switch/set true})
     (swap! !input inc)
-    % := 3))
+    % := 3
+    (dispose)))
 
 (defmacro merge-events [& events]
   `(->> (p/fn [] (apply merge ~@events))

diff --git a/src/hyperfiddle/zero.cljc b/src/hyperfiddle/zero.cljc
@@ -155,17 +155,20 @@ return nothing (you return nil) but in flows nothing is different than nil." [t]
 
 (tests
   "logical clock"
-  (with (p/run (! clock)) [% % %] := [::tick ::tick ::tick]))
+  (let [dispose (p/run (! clock))]
+    [% % %] := [::tick ::tick ::tick]
+    (dispose)))
 
 (defn system-time-ms [_] #?(:clj (System/currentTimeMillis) :cljs (js/Date.now)))
 
 (p/def time #_"ms since Jan 1 1970" (new (m/latest system-time-ms <clock)))
 
 (tests
   "millisecond time as a stable test"
-  (with (p/run (! time))
+  (let [dispose (p/run (! time))]
     [% % %] := [_ _ _]
-    (map int? *1) := [true true true]))
+    (map int? *1) := [true true true]
+    (dispose)))
 
 (comment
   ; This ticker will skew and therefore is not useful other than as an example