Only run setup if needed

status-im · Oct 30, 2023 · bd97ac0 · bd97ac0
1 parent f4468ab
commit bd97ac0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/status_im2/integration_test/helpers.cljs b/src/status_im2/integration_test/helpers.cljs
@@ -19,10 +19,14 @@
   (rf/dispatch [:profile.create/create-and-login
                 {:display-name constants/account-name :password constants/password :color "blue"}]))
 
-(defn assert-app-initialized
+(defn app-initialized
   []
   (let [app-state @(rf/subscribe [:app-state])]
-    (is (= "active" app-state))))
+    (= "active" app-state)))
+
+(defn assert-app-initialized
+  []
+  (is (app-initialized)))
 
 (defn messenger-started
   []

diff --git a/src/status_im2/integration_test/macros.clj b/src/status_im2/integration_test/macros.clj
@@ -4,16 +4,20 @@
 
 (defmacro with-app-initialized
   [& body]
-  `(do
-     (rf/dispatch [:app-started])
-     (rf-test/wait-for
-       [:profile/get-profiles-overview-success]
-       ~@body)))
+  `(if (status-im2.integration-test.helpers/app-initialized)
+     (do ~@body)
+     (do
+       (rf/dispatch [:app-started])
+       (rf-test/wait-for
+         [:profile/get-profiles-overview-success]
+         ~@body))))
 
 (defmacro with-account
   [& body]
-  `(do
-     (status-im2.integration-test.helpers/create-multiaccount!)
-     (rf-test/wait-for
-       [:status-im.transport.core/messenger-started]
-       ~@body)))
+  `(if (status-im2.integration-test.helpers/messenger-started)
+     (do ~@body)
+     (do
+       (status-im2.integration-test.helpers/create-multiaccount!)
+       (rf-test/wait-for
+         [:status-im.transport.core/messenger-started]
+         ~@body))))