Separate Deps Test Aliases

Starting with version 1.12.3 Cursive does start the REPL in a way that is incompatible with the main-opts from Kaocha. So separating the aliases for :test and :kaocha was necessary. Furthermore I also removed the :test parts of :test-coverage which removed duplication.
samply · Apr 28, 2022 · 90242b8 · 90242b8
1 parent e5e56dc
commit 90242b8
Show file tree

Hide file tree

Showing 65 changed files with 299 additions and 412 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ lint-root:
 lint: $(MODULES) lint-root
 
 test-root:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test: $(MODULES) test-root
 

diff --git a/modules/anomaly/Makefile b/modules/anomaly/Makefile
@@ -2,10 +2,10 @@ lint:
 	clj-kondo --lint src test deps.edn
 
 test:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage:
-	clojure -M:test-coverage
+	clojure -M:test:coverage
 
 clean:
 	rm -rf .clj-kondo/.cache .cpcache target

diff --git a/modules/anomaly/deps.edn b/modules/anomaly/deps.edn
@@ -11,21 +11,18 @@
 
    :extra-deps
    {blaze/test-util
-    {:local/root "../test-util"}
+    {:local/root "../test-util"}}}
 
-    lambdaisland/kaocha
+  :kaocha
+  {:extra-deps
+   {lambdaisland/kaocha
     {:mvn/version "1.65.1029"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 
-  :test-coverage
-  {:extra-paths ["test"]
-
-   :extra-deps
-   {blaze/test-util
-    {:local/root "../test-util"}
-
-    cloverage/cloverage
+  :coverage
+  {:extra-deps
+   {cloverage/cloverage
     {:mvn/version "1.2.3"}}
 
    :main-opts ["-m" "cloverage.coverage" "--codecov" "-p" "src" "-s" "test"]}}}
diff --git a/modules/async/Makefile b/modules/async/Makefile
@@ -2,10 +2,10 @@ lint:
 	clj-kondo --lint src test deps.edn
 
 test:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage:
-	clojure -M:test-coverage
+	clojure -M:test:coverage
 
 clean:
 	rm -rf .clj-kondo/.cache .cpcache target

diff --git a/modules/async/deps.edn b/modules/async/deps.edn
@@ -14,21 +14,18 @@
 
    :extra-deps
    {blaze/test-util
-    {:local/root "../test-util"}
+    {:local/root "../test-util"}}}
 
-    lambdaisland/kaocha
+  :kaocha
+  {:extra-deps
+   {lambdaisland/kaocha
     {:mvn/version "1.65.1029"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 
-  :test-coverage
-  {:extra-paths ["test"]
-
-   :extra-deps
-   {blaze/test-util
-    {:local/root "../test-util"}
-
-    cloverage/cloverage
+  :coverage
+  {:extra-deps
+   {cloverage/cloverage
     {:mvn/version "1.2.3"}}
 
    :main-opts ["-m" "cloverage.coverage" "--codecov" "-p" "src" "-s" "test"]}}}
diff --git a/modules/byte-buffer/Makefile b/modules/byte-buffer/Makefile
@@ -2,7 +2,7 @@ lint:
 	clj-kondo --lint src test deps.edn
 
 test:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage:
 	true

diff --git a/modules/byte-buffer/deps.edn b/modules/byte-buffer/deps.edn
@@ -8,9 +8,11 @@
 
    :extra-deps
    {blaze/test-util
-    {:local/root "../test-util"}
+    {:local/root "../test-util"}}}
 
-    lambdaisland/kaocha
+  :kaocha
+  {:extra-deps
+   {lambdaisland/kaocha
     {:mvn/version "1.65.1029"}}
 
    :main-opts ["-m" "kaocha.runner"]}}}
diff --git a/modules/cassandra/Makefile b/modules/cassandra/Makefile
@@ -2,10 +2,10 @@ lint:
 	clj-kondo --lint src test deps.edn
 
 test:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage:
-	clojure -M:test-coverage
+	clojure -M:test:coverage
 
 clean:
 	rm -rf .clj-kondo/.cache .cpcache target

diff --git a/modules/cassandra/deps.edn b/modules/cassandra/deps.edn
@@ -21,26 +21,20 @@
    {blaze/test-util
     {:local/root "../test-util"}
 
-    lambdaisland/kaocha
-    {:mvn/version "1.65.1029"}
-
     org.clojars.akiel/iota
-    {:mvn/version "0.1"}}
-
-   :main-opts ["-m" "kaocha.runner"]}
-
-  :test-coverage
-  {:extra-paths ["test"]
+    {:mvn/version "0.1"}}}
 
-   :extra-deps
-   {blaze/test-util
-    {:local/root "../test-util"}
+  :kaocha
+  {:extra-deps
+   {lambdaisland/kaocha
+    {:mvn/version "1.65.1029"}}
 
-    cloverage/cloverage
-    {:mvn/version "1.2.3"}
+   :main-opts ["-m" "kaocha.runner"]}
 
-    org.clojars.akiel/iota
-    {:mvn/version "0.1"}}
+  :coverage
+  {:extra-deps
+   {cloverage/cloverage
+    {:mvn/version "1.2.3"}}
 
    :main-opts ["-m" "cloverage.coverage" "--codecov" "-p" "src" "-s" "test"
                "-e" ".+spec"]}}}
diff --git a/modules/coll/Makefile b/modules/coll/Makefile
@@ -2,10 +2,10 @@ lint:
 	clj-kondo --lint src test deps.edn
 
 test:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage:
-	clojure -M:test-coverage
+	clojure -M:test:coverage
 
 clean:
 	rm -rf .clj-kondo/.cache .cpcache target

diff --git a/modules/coll/deps.edn b/modules/coll/deps.edn
@@ -3,18 +3,17 @@
 
  :aliases
  {:test
-  {:extra-paths ["test"]
+  {:extra-paths ["test"]}
 
-   :extra-deps
+  :kaocha
+  {:extra-deps
    {lambdaisland/kaocha
     {:mvn/version "1.65.1029"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 
-  :test-coverage
-  {:extra-paths ["test"]
-
-   :extra-deps
+  :coverage
+  {:extra-deps
    {cloverage/cloverage
     {:mvn/version "1.2.3"}}
 

diff --git a/modules/cql/Makefile b/modules/cql/Makefile
@@ -9,10 +9,10 @@ cql-test:
 	sed -i.bak '277d' cql-test/CqlArithmeticFunctionsTest.xml
 
 test: cql-test
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage: cql-test
-	clojure -M:test-coverage
+	clojure -M:test:coverage
 
 clean:
 	rm -rf .clj-kondo/.cache .cpcache cql-test target

diff --git a/modules/cql/deps.edn b/modules/cql/deps.edn
@@ -36,26 +36,20 @@
    {blaze/db-stub
     {:local/root "../db-stub"}
 
-    lambdaisland/kaocha
-    {:mvn/version "1.65.1029"}
-
     org.clojure/data.xml
-    {:mvn/version "0.2.0-alpha6"}}
-
-   :main-opts ["-m" "kaocha.runner"]}
-
-  :test-coverage
-  {:extra-paths ["test"]
+    {:mvn/version "0.2.0-alpha6"}}}
 
-   :extra-deps
-   {blaze/db-stub
-    {:local/root "../db-stub"}
+  :kaocha
+  {:extra-deps
+   {lambdaisland/kaocha
+    {:mvn/version "1.65.1029"}}
 
-    cloverage/cloverage
-    {:mvn/version "1.2.3"}
+   :main-opts ["-m" "kaocha.runner"]}
 
-    org.clojure/data.xml
-    {:mvn/version "0.2.0-alpha6"}}
+  :coverage
+  {:extra-deps
+   {cloverage/cloverage
+    {:mvn/version "1.2.3"}}
 
    :main-opts ["-m" "cloverage.coverage" "--codecov" "-p" "src" "-s" "test"
                "-e" ".*spec$"]}}}
diff --git a/modules/db-resource-store-cassandra/Makefile b/modules/db-resource-store-cassandra/Makefile
@@ -2,10 +2,10 @@ lint:
 	clj-kondo --lint src test deps.edn
 
 test:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage:
-	clojure -M:test-coverage
+	clojure -M:test:coverage
 
 clean:
 	rm -rf .clj-kondo/.cache .cpcache target

diff --git a/modules/db-resource-store-cassandra/deps.edn b/modules/db-resource-store-cassandra/deps.edn
@@ -20,21 +20,18 @@
 
    :extra-deps
    {blaze/test-util
-    {:local/root "../test-util"}
+    {:local/root "../test-util"}}}
 
-    lambdaisland/kaocha
+  :kaocha
+  {:extra-deps
+   {lambdaisland/kaocha
     {:mvn/version "1.65.1029"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 
-  :test-coverage
-  {:extra-paths ["test"]
-
-   :extra-deps
-   {blaze/test-util
-    {:local/root "../test-util"}
-
-    cloverage/cloverage
+  :coverage
+  {:extra-deps
+   {cloverage/cloverage
     {:mvn/version "1.2.3"}}
 
    :main-opts ["-m" "cloverage.coverage" "--codecov" "-p" "src" "-s" "test"]}}}
diff --git a/modules/db-resource-store/Makefile b/modules/db-resource-store/Makefile
@@ -2,10 +2,10 @@ lint:
 	clj-kondo --lint src test deps.edn
 
 test:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage:
-	clojure -M:test-coverage
+	clojure -M:test:coverage
 
 clean:
 	rm -rf .clj-kondo/.cache .cpcache target

diff --git a/modules/db-resource-store/deps.edn b/modules/db-resource-store/deps.edn
@@ -28,26 +28,20 @@
     criterium/criterium
     {:mvn/version "0.4.6"}
 
-    lambdaisland/kaocha
-    {:mvn/version "1.65.1029"}
-
     mvxcvi/clj-cbor
-    {:mvn/version "1.1.0"}}
-
-   :main-opts ["-m" "kaocha.runner"]}
-
-  :test-coverage
-  {:extra-paths ["test"]
+    {:mvn/version "1.1.0"}}}
 
-   :extra-deps
-   {blaze/test-util
-    {:local/root "../test-util"}
+  :kaocha
+  {:extra-deps
+   {lambdaisland/kaocha
+    {:mvn/version "1.65.1029"}}
 
-    cloverage/cloverage
-    {:mvn/version "1.2.3"}
+   :main-opts ["-m" "kaocha.runner"]}
 
-    mvxcvi/clj-cbor
-    {:mvn/version "1.1.0"}}
+  :coverage
+  {:extra-deps
+   {cloverage/cloverage
+    {:mvn/version "1.2.3"}}
 
    :main-opts ["-m" "cloverage.coverage" "--codecov" "-p" "src" "-s" "test"
                "-e" ".*-spec$"]}}}
diff --git a/modules/db-tx-log-kafka/Makefile b/modules/db-tx-log-kafka/Makefile
@@ -2,10 +2,10 @@ lint:
 	clj-kondo --lint src test deps.edn
 
 test:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage:
-	clojure -M:test-coverage
+	clojure -M:test:coverage
 
 clean:
 	rm -rf .clj-kondo/.cache .cpcache target

diff --git a/modules/db-tx-log-kafka/deps.edn b/modules/db-tx-log-kafka/deps.edn
@@ -23,21 +23,18 @@
 
    :extra-deps
    {blaze/test-util
-    {:local/root "../test-util"}
+    {:local/root "../test-util"}}}
 
-    lambdaisland/kaocha
+  :kaocha
+  {:extra-deps
+   {lambdaisland/kaocha
     {:mvn/version "1.65.1029"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 
-  :test-coverage
-  {:extra-paths ["test"]
-
-   :extra-deps
-   {blaze/test-util
-    {:local/root "../test-util"}
-
-    cloverage/cloverage
+  :coverage
+  {:extra-deps
+   {cloverage/cloverage
     {:mvn/version "1.2.3"}}
 
    :main-opts ["-m" "cloverage.coverage" "--codecov" "-p" "src" "-s" "test"]}}}
diff --git a/modules/db-tx-log/Makefile b/modules/db-tx-log/Makefile
@@ -2,10 +2,10 @@ lint:
 	clj-kondo --lint src test deps.edn
 
 test:
-	clojure -M:test --profile :ci
+	clojure -M:test:kaocha --profile :ci
 
 test-coverage:
-	clojure -M:test-coverage
+	clojure -M:test:coverage
 
 clean:
 	rm -rf .clj-kondo/.cache .cpcache target