Merge pull request #17 from Olical/advanced-optimisations

Fix test running with something other than :none optmisations

Author: Olical

Diff for: README.md

@@ -71,7 +71,35 @@ $ clojure -Atest --help
 
 ## Gotchas
 
- * Make sure the directory (or directories!) containing your tests are on your Java class path. Specify this with a top level `:paths` key in your `deps.edn` file.
+### Paths
+
+Make sure the directory (or directories!) containing your tests are on your Java class path. Specify this with a top level `:paths` key in your `deps.edn` file.
+
+### Advanced compilation
+
+This actually applies to everything other than `{:optimizations :none}` (which is the default). To use any Closure Compiler optimisation levels you will need to create an EDN file containing something like this:
+
+```edn
+{:optimizations :advanced}
+```
+
+The Closure compiler requires the generated test runner to be on the path so you'll need to add this to your `:paths` key in your `deps.edn`:
+
+```edn
+:paths ["src" "test" "cljs-test-runner-out/gen"]
+```
+
+It will fail the first time you run this, that's because that directory doesn't exist yet so it'll be removed from the path on startup. To fix this you can run the following before executing your tests:
+
+```bash
+mkdir -p cljs-test-runner-out/gen
+```
+
+Now when you run the following, your tests will be executed with advanced compilation:
+
+```bash
+clj -m cljs-test-runner.main -c ./config/advanced-compilation.edn
+```
 
 ## Unlicenced
 

Diff for: deps.edn

@@ -1,4 +1,4 @@
-{:paths ["src" "test" "other-tests"]
+{:paths ["src" "test" "other-tests" "cljs-test-runner-out/gen"]
  :deps {org.clojure/clojure {:mvn/version "1.9.0"}
         org.clojure/clojurescript {:mvn/version "1.10.339"}
         org.clojure/tools.namespace {:mvn/version "0.3.0-alpha4"}

Diff for: src/cljs_test_runner/main.clj

@@ -56,14 +56,14 @@
   "Renders a ClojureScript test runner from a seq of namespaces."
   [nses {:keys [var include exclude]}]
   (str
-    "(ns test.runner
-       (:require [doo.runner :refer-macros [doo-tests]]"
-                 (str/join " " nses)"))"
+    "(ns cljs-test-runner.gen
+       (:require [doo.runner :refer-macros [doo-tests]] [" (str/join "] [" nses)"]))"
      ns-filter-cljs
      "(filter-vars! {" (str/join ", " (map #(str % " (ns-publics " (format-value %) ")") nses)) "}
         (var-filter {:var " (format-filter var) "
                      :include " (format-filter include) "
                      :exclude " (format-filter exclude) "}))"
+     "\n"
      "(doo-tests " (str/join " " (map format-value nses)) ")"))
 
 (defn ns-filter-fn
@@ -113,8 +113,8 @@
                                                        :exclude exclude}))
         exit-code (atom 1)
         gen-path (str/join "/" [out "gen"])
-        src-path (str/join "/" [gen-path "test-runner.cljs"])
-        out-path (str/join "/" [out "test-runner.js"])
+        src-path (str/join "/" [gen-path "cljs_test_runner" "gen.cljs"])
+        out-path (str/join "/" [out "cljs_test_runner.gen.js"])
         {:keys [target doo-env]} (case env
                                    :node {:target :nodejs
                                           :doo-env :node}
@@ -126,7 +126,7 @@
       (let [build-opts (merge {:output-to out-path
                                :output-dir out
                                :target target
-                               :main 'test.runner
+                               :main "cljs-test-runner.gen"
                                :optimizations :none
                                :verbose verbose}
                               compile-opts)
@@ -231,5 +231,8 @@
   ;; doo-opts
   (run "-D" "test/doo-opts-test.edn")
 
+  ;; cljs-opts
+  (run "-c" "test/cljs-opts-test.edn")
+
   ;; help
   (run "-H"))

Diff for: test/cljs-opts-test.edn

@@ -0,0 +1 @@
+{:optimizations :advanced}