Remove *-watch targets and rename test targets

status-im · Jan 5, 2024 · b2ad9e3 · b2ad9e3
1 parent 4c97a81
commit b2ad9e3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 38 deletions.
diff --git a/Makefile b/Makefile
@@ -335,28 +335,24 @@ shadow-server: export TARGET := clojure
 shadow-server:##@ Start shadow-cljs in server mode for watching
 	yarn shadow-cljs server
 
-_clojure-test: export TARGET := clojure
-_clojure-test:
+_test-clojure: export TARGET := clojure
+_test-clojure: export WATCH ?= false
+_test-clojure:
+ifeq ($(WATCH), true)
 	yarn install && \
 	yarn shadow-cljs compile mocks && \
-	yarn shadow-cljs compile test && \
-	node --require ./test-resources/override.js "$$SHADOW_OUTPUT_TO"
-
-_clojure-test-watch: export TARGET := clojure
-_clojure-test-watch:
+	nodemon --exec "yarn shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
+else
 	yarn install && \
 	yarn shadow-cljs compile mocks && \
-	nodemon --exec "yarn shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
+	yarn shadow-cljs compile test && \
+	node --require ./test-resources/override.js "$$SHADOW_OUTPUT_TO"
+endif
 
 test: export SHADOW_OUTPUT_TO := target/test/test.js
 test: export SHADOW_NS_REGEXP := .*-test$$
 test: ##@test Run all Clojure tests
-test: _clojure-test
-
-test-watch: export SHADOW_OUTPUT_TO := target/test/test.js
-test-watch: export SHADOW_NS_REGEXP := .*-test$$
-test-watch: ##@test Watch all Clojure tests and re-run when files change
-test-watch: _clojure-test-watch
+test: _test-clojure
 
 test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
 test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
@@ -368,25 +364,15 @@ test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connection
 		'yarn shadow-cljs watch test --verbose' \
 		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"
 
-unit-test: export SHADOW_OUTPUT_TO := target/unit_test/test.js
-unit-test: export SHADOW_NS_REGEXP := ^(?!status-im\.integration-test).*-test$$
-unit-test: ##@test Run unit tests
-unit-test: _clojure-test
-
-unit-test-watch: export SHADOW_OUTPUT_TO := target/unit_test/test.js
-unit-test-watch: export SHADOW_NS_REGEXP := ^(?!status-im\.integration-test).*-test$$
-unit-test-watch: ##@test Watch unit tests and re-run when files change
-unit-test-watch: _clojure-test-watch
-
-integration-test: export SHADOW_OUTPUT_TO := target/integration_test/test.js
-integration-test: export SHADOW_NS_REGEXP := ^status-im\.integration-test.*$$
-integration-test: ##@test Run integration tests
-integration-test: _clojure-test
-
-integration-test-watch: export SHADOW_OUTPUT_TO := target/integration_test/test.js
-integration-test-watch: export SHADOW_NS_REGEXP := ^status-im\.integration-test.*$$
-integration-test-watch: ##@test Watch integration tests and re-run when files change
-integration-test-watch: _clojure-test-watch
+test-unit: export SHADOW_OUTPUT_TO := target/unit_test/test.js
+test-unit: export SHADOW_NS_REGEXP := ^(?!status-im\.integration-test).*-test$$
+test-unit: ##@test Run unit tests
+test-unit: _test-clojure
+
+test-integration: export SHADOW_OUTPUT_TO := target/integration_test/test.js
+test-integration: export SHADOW_NS_REGEXP := ^status-im\.integration-test.*$$
+test-integration: ##@test Run integration tests
+test-integration: _test-clojure
 
 android-test: jsbundle
 android-test: export TARGET := android

diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests
@@ -56,7 +56,7 @@ pipeline {
           steps {
             sh """#!/bin/bash
               set -eo pipefail
-              make unit-test 2>&1 | tee -a ${LOG_FILE}
+              make test-unit 2>&1 | tee -a ${LOG_FILE}
             """
           }
         }
@@ -66,7 +66,7 @@ pipeline {
       steps {
         sh """#!/bin/bash
           set -eo pipefail
-          make integration-test 2>&1 | tee -a ${LOG_FILE}
+          make test-integration 2>&1 | tee -a ${LOG_FILE}
         """
       }
     }

diff --git a/doc/testing.md b/doc/testing.md
@@ -5,18 +5,18 @@
 To run tests:
 
 ```
-   make test
+make test
 ```
 
 
 
 Also test watcher can be launched. It will re-run the entire test suite when any file is modified
 
 ```
-   make test-watch
+make test WATCH=true
 ```
 
-Developers can also manually change the shadow-cljs option `:ns-regex` to control which namespaces the test runner should pick. 
+Developers can also manually change the shadow-cljs option `:ns-regex` to control which namespaces the test runner should pick.
 
 ## Testing with REPL