From 22f3dba842b44522bbb0225f01dd86682bbb9bd8 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 7 Aug 2024 15:47:48 +0200 Subject: [PATCH] :lipstick: Update run-store helper --- .../test/frontend_tests/helpers/state.cljs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/frontend/test/frontend_tests/helpers/state.cljs b/frontend/test/frontend_tests/helpers/state.cljs index 37d245df5..2f73c4d8d 100644 --- a/frontend/test/frontend_tests/helpers/state.cljs +++ b/frontend/test/frontend_tests/helpers/state.cljs @@ -42,21 +42,25 @@ ([store done events completed-cb] (run-store store done events completed-cb nil)) ([store done events completed-cb stopper] - (let [stream (ptk/input-stream store)] + (let [stream (ptk/input-stream store) + stopper-s (if (fn? stopper) + (stopper stream) + (rx/filter #(= :the/end %) stream))] + (->> stream - (rx/take-until (if stopper - (stopper stream) - (rx/filter #(= :the/end %) stream))) + (rx/take-until stopper-s) (rx/last) - (rx/tap (fn [] + (rx/tap (fn [_] (completed-cb @store))) (rx/subs! (fn [_] (done)) (fn [cause] (js/console.log "[error]:" cause)) (fn [_] (js/console.log "[complete]")))) - (doall (for [event events] - (ptk/emit! store event))) + + (doseq [event events] + (ptk/emit! store event)) + (ptk/emit! store :the/end)))) (defn get-file-from-store