Move shadow e2e tests to the end.

chr15m · Mar 30, 2024 · ec63c5f · ec63c5f
1 parent 638260a
commit ec63c5f
Showing 1 changed file with 52 additions and 52 deletions.
diff --git a/src/sitefoxtest/e2etests.cljs b/src/sitefoxtest/e2etests.cljs
@@ -85,58 +85,6 @@
     (.close browser))
   (done))
 
-#_ (deftest basic-shadow-dev-test
-  (t/testing "Basic test of Sitefox on shadow-cljs."
-    (async done
-           (p/let [_ (log "Test: basic-shadow-dev-test")
-                   server (run-server "examples/shadow-cljs"
-                                      "npm i --no-save; npm run serve"
-                                      8000)]
-             (p/catch
-               (p/let [res (js/fetch base-url)
-                       text (.text res)]
-                 (log "Starting test checks.")
-                 (is (j/get-in server [:process :pid])
-                     "Server is running?")
-                 (is (j/get server :open)
-                     "Server port is open?")
-                 (is (j/get res :ok)
-                     "Was server response ok?")
-                 (is (includes? text "Hello")
-                     "Server response includes 'Hello' text?")
-                 (log "Test done. Killing server.")
-                 (j/call server :kill)
-                 (log "After server.")
-                 (print)
-                 (done))
-               #(catch-fail % done server))))))
-
-#_ (deftest basic-compiled-shadow-test
-  (t/testing "Basic test of Sitefox on compiled shadow-cljs."
-    (async done
-           (p/let [_ (log "Test: basic-compiled-shadow-test")
-                   server (run-server "examples/shadow-cljs"
-                                      "npm i --no-save; npm run serve-live"
-                                      8000)]
-             (p/catch
-               (p/let [res (js/fetch base-url)
-                       text (.text res)]
-                 (log "Starting test checks.")
-                 (is (j/get-in server [:process :pid])
-                     "Server is running?")
-                 (is (j/get server :open)
-                     "Server port is open?")
-                 (is (j/get res :ok)
-                     "Was server response ok?")
-                 (is (includes? text "Hello")
-                     "Server response includes 'Hello' text?")
-                 (log "Test done. Killing server.")
-                 (j/call server :kill)
-                 (log "After server.")
-                 (print)
-                 (done))
-               #(catch-fail % done server))))))
-
 (deftest basic-site-test
   (t/testing "Basic test of Sitefox on nbb."
     (async done
@@ -411,5 +359,57 @@
                  (done))
                #(catch-fail % done server browser))))))
 
+#_ (deftest basic-shadow-dev-test
+  (t/testing "Basic test of Sitefox on shadow-cljs."
+    (async done
+           (p/let [_ (log "Test: basic-shadow-dev-test")
+                   server (run-server "examples/shadow-cljs"
+                                      "npm i --no-save; npm run serve"
+                                      8000)]
+             (p/catch
+               (p/let [res (js/fetch base-url)
+                       text (.text res)]
+                 (log "Starting test checks.")
+                 (is (j/get-in server [:process :pid])
+                     "Server is running?")
+                 (is (j/get server :open)
+                     "Server port is open?")
+                 (is (j/get res :ok)
+                     "Was server response ok?")
+                 (is (includes? text "Hello")
+                     "Server response includes 'Hello' text?")
+                 (log "Test done. Killing server.")
+                 (j/call server :kill)
+                 (log "After server.")
+                 (print)
+                 (done))
+               #(catch-fail % done server))))))
+
+(deftest basic-compiled-shadow-test
+  (t/testing "Basic test of Sitefox on compiled shadow-cljs."
+    (async done
+           (p/let [_ (log "Test: basic-compiled-shadow-test")
+                   server (run-server "examples/shadow-cljs"
+                                      "npm i --no-save; npm run serve-live"
+                                      8000)]
+             (p/catch
+               (p/let [res (js/fetch base-url)
+                       text (.text res)]
+                 (log "Starting test checks.")
+                 (is (j/get-in server [:process :pid])
+                     "Server is running?")
+                 (is (j/get server :open)
+                     "Server port is open?")
+                 (is (j/get res :ok)
+                     "Was server response ok?")
+                 (is (includes? text "Hello")
+                     "Server response includes 'Hello' text?")
+                 (log "Test done. Killing server.")
+                 (j/call server :kill)
+                 (log "After server.")
+                 (print)
+                 (done))
+               #(catch-fail % done server))))))
+
 ;(t/run-test sitefoxtest.e2etests/nbb-forms)
 (t/run-tests *ns*)