clj-pour · dazld · Apr 8, 2021 · Apr 8, 2021 · Apr 8, 2021 · Apr 8, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,27 +2,22 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/clojure:tools-deps
-
-    working_directory: ~/repo
-
-    environment:
-      LEIN_ROOT: "true"
-      JVM_OPTS: -Xmx3200m
-
+      - image: circleci/clojure:tools-deps-1.10.0.442-node
     steps:
       - checkout
-
-      # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "deps.edn" }}
-
-      - run: clojure -R:test -e ""
-
+            - 'clj-v1-{{ checksum "deps.edn" }}-{{ checksum "package-lock.json" }}'
+            - 'clj-v1'
+      - run: npm ci
+      - run: mkdir -p test-results
+      - run: bin/kaocha --plugin kaocha.plugin/junit-xml --junit-xml-file  test-results/kaocha/results.xml
+      - store_test_results:
+          path: test-results
       - save_cache:
+          key: 'clj-v1-{{checksum "deps.edn"}}-{{ checksum "package-lock.json" }}'
           paths:
             - ~/.m2
-          key: v1-dependencies-{{ checksum "deps.edn" }}
-
-      - run: clojure -A:test
+            - ~/.cljs/.aot_cache
+            - ~/node_modules
+            - ~/.gitlibs
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ pom.xml.asc
 .cpcache/
 /test-results
 /.cljs_node_repl
+/public
diff --git a/Makefile b/Makefile
@@ -0,0 +1,8 @@
+dev:
+	npx shadow-cljs node-repl
+
+test-watch:
+	bin/kaocha --watch
+
+test:
+	bin/kaocha
diff --git a/bin/kaocha b/bin/kaocha
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+clojure -A:test -m kaocha.runner "$@"
diff --git a/deps.edn b/deps.edn
@@ -5,9 +5,9 @@
  :aliases {:provided {:extra-deps {org.clojure/clojure       {:mvn/version "1.10.3"}
                                    org.clojure/clojurescript {:mvn/version "1.10.773"}}}
            :test     {:extra-paths ["test" "dev"]
-                      :extra-deps  {com.datomic/datomic-free  {:mvn/version "0.9.5697"
-                                                               :exclusions  [joda-time/joda-time
-                                                                             commons-codec/commons-codec]}
-                                    com.cognitect/test-runner {:git/url "https://github.com/cognitect-labs/test-runner.git"
-                                                               :sha     "b6b3193fcc42659d7e46ecd1884a228993441182"}}
-                      :main-opts   ["-m" "cognitect.test-runner"]}}}
+                      :extra-deps  {lambdaisland/kaocha           {:mvn/version "1.0.732"}
+                                    lambdaisland/kaocha-cljs      {:mvn/version "0.0-71"}
+                                    lambdaisland/kaocha-junit-xml {:mvn/version "0.0.76"}
+                                    com.cognitect/test-runner     {:git/url "https://github.com/cognitect-labs/test-runner.git"
+                                                                   :sha     "b6b3193fcc42659d7e46ecd1884a228993441182"}}}}}
+                      ;:main-opts   ["-m" "cognitect.test-runner"]}}}
diff --git a/dev/user.cljs b/dev/user.cljs
@@ -0,0 +1,4 @@
+(ns user)
+
+(defn main []
+  (prn ::cljs))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env bash

		clojure -A:test -m kaocha.runner "$@"