Merge branch 'feature/test-slimmerjs' into develop

.travis.yml

@@ -1,6 +1,15 @@
 language: clojure
 lein: lein2
-script: "lein2 test"
+script: "lein2 test-slimer"
 before_install:
  - sudo apt-get update -qq
- - sudo apt-get install -qq rhino
+ - sudo apt-get install -qq rhino
+env:
+  - SLIMERJSLAUNCHER=$(which firefox) DISPLAY=:99.0 PATH=$TRAVIS_BUILD_DIR/slimerjs:$PATH
+addons:
+  firefox: "34.0"
+before_script:
+  - "echo 'Installing Slimer'"
+  - "wget http://download.slimerjs.org/releases/0.9.4/slimerjs-0.9.4.zip"
+  - "unzip slimerjs-0.9.4.zip"
+  - "mv slimerjs-0.9.4 ./slimerjs"

project.clj

@@ -35,9 +35,13 @@
                                             :pretty-print true}}]
                  
                  :test-commands {"rhino" ["rhino" "-opt" "-1" :rhino-runner
-                                            ""
+                                            "run/compiled/test.js"]
-                                            "run/compiled/test.js"]}}
+                                 "slimer" ["xvfb-run" "-a" "slimerjs" :runner
+                                                   "run/compiled/test.js"]
+                                 "phantom" ["phantomjs" ; doesn't work with phantomjs < 2.0.0
+                                            :runner "run/compiled/test.js"]}}
   
   :aliases      {"auto"  ["do" "clean," "cljsbuild" "clean," "cljsbuild" "auto" "demo,"]
                  "once"  ["do" "clean," "cljsbuild" "clean," "cljsbuild" "once" "demo,"]
-                 "test"  ["do" "clean," "cljsbuild" "once," "cljsbuild" "test" "rhino"]})
+                 "test-rhino"  ["do" "clean," "cljsbuild" "once," "cljsbuild" "test" "rhino"]
+                 "test-slimer" ["do" "clean," "cljsbuild" "once," "cljsbuild" "test" "slimer"] })