From 2fcb1fbe0a67289cb2a63c7c2f86bfbcd2c92242 Mon Sep 17 00:00:00 2001
From: jeluard <julien.eluard@gmail.com>
Date: Mon, 1 Oct 2018 08:44:29 +0200
Subject: [PATCH] Improved CLJS testing infrastructure

---
 README.md        | 23 +++++------------------
 deps.edn         | 17 ++++++++---------
 scripts/tests.sh |  2 --
 3 files changed, 13 insertions(+), 29 deletions(-)
 delete mode 100644 scripts/tests.sh

diff --git a/README.md b/README.md
index 5b3e1dc..fa67f9c 100644
--- a/README.md
+++ b/README.md
@@ -5,32 +5,19 @@
 
 Development requires [Deps and CLI](https://clojure.org/guides/getting_started) tooling installed.
 
-Run Clojure tests using `clojure -A:test-clj`
-Run ClojureScript tests using `clojure -A:test-cljs`
-
 Run figwheel using `clojure -A:figwheel`.
 
+### Tests 
+
+Run Clojure tests using `clojure -A:test-clj` (or continuously via `clojure -A:test-clj -w src`)
+Run ClojureScript tests using `clojure -A:test-cljs`
+
 ## Documentation
 
 Documentation website is maintained using [docusaurus](https://docusaurus.io). The layout logic can be found in `website` while the content is kept in `docs`.
 
 To hack on the documentation, run `npm run start` in `website` folder.
 
-### IPFS
-
-To upload a directory to IPFS:
-
-```
-ipfs daemon
-```
-
-To add a directory:
-
-`ipfs add -r {dir-name}`
-
-After that it will be available through localhost:8080 and the main gateway.
-It will eventually disappear from the main gateway.
-
 ## Continous Deployment
 
 To make possible deploying the new version of the page from the `master` branch a Jenkins job is configured at:
diff --git a/deps.edn b/deps.edn
index 34a6e7a..6a97ee4 100644
--- a/deps.edn
+++ b/deps.edn
@@ -1,8 +1,8 @@
 {:deps {org.clojure/clojure             {:mvn/version "1.9.0"}
-        org.clojure/clojurescript       {:mvn/version "1.10.329"}
-        org.clojure/tools.reader        {:mvn/version "1.2.1"}
-        reagent                         {:mvn/version "0.8.0"}
-        re-frame                        {:mvn/version "0.10.5"}}
+        org.clojure/clojurescript       {:mvn/version "1.10.339"}
+        org.clojure/tools.reader        {:mvn/version "1.3.0"}
+        reagent                         {:mvn/version "0.8.1"}
+        re-frame                        {:mvn/version "0.10.6"}}
  :paths ["src"]
  :aliases {:examples {:extra-paths ["examples/src"]}
            :figwheel {:extra-paths ["target" "examples/src" "figwheel/resources" "figwheel/src"]
@@ -11,9 +11,8 @@
                                     binaryage/devtools              {:mvn/version "0.9.10"}}
                       :main-opts   ["-m" "figwheel.main" "-b" "figwheel/dev" "-r"]}
            :test-clj {:extra-paths ["test"]
-                      :extra-deps  {com.cognitect/test-runner {:git/url "https://github.com/cognitect-labs/test-runner.git"
-                                                               :sha      "5fb4fc46ad0bf2e0ce45eba5b9117a2e89166479"}}
-                      :main-opts   ["-m" "cognitect.test-runner"]}
+                      :extra-deps  {eftest {:mvn/version "0.5.2"}}
+                      :main-opts   ["-e"  "(require,'[eftest.runner,:refer,[find-tests,run-tests]]),(run-tests,(find-tests,\"test\"))"]}
            :test-cljs {:extra-paths ["test"]
-                       :extra-deps  {olical/cljs-test-runner {:mvn/version "1.0.0"}}
-                       :main-opts   ["-m" "cljs-test-runner.main"]}}}
+                       :extra-deps  {olical/cljs-test-runner {:mvn/version "2.1.0"}}
+                       :main-opts   ["-m" "cljs-test-runner.main" "-o" "target/cljs-test-runner-out"]}}}
diff --git a/scripts/tests.sh b/scripts/tests.sh
deleted file mode 100644
index a194111..0000000
--- a/scripts/tests.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-clojure -Sdeps '{:deps {eftest {:mvn/version "0.5.2"}} :paths ["src" "test"]}' -e "(require '[eftest.runner :refer [find-tests run-tests]]) (run-tests (find-tests \"test\"))"
-clojure -A:test-cljs