Merge pull request #669 from hexid/refactor-travis

Refactor Travis config

@@ -8,3 +8,4 @@ tests/testdir/**
 tmp
 ./*.js
 ./phantomjs*/*
+./engine/*

@@ -3,38 +3,21 @@ branches:
     - "master"
 
 before_install:
-  - echo "installing PhantomJS 1.8.2"
-  - wget http://phantomjs.googlecode.com/files/phantomjs-1.8.2-linux-x86_64.tar.bz2
-  - tar -xvf phantomjs-1.8.2-linux-x86_64.tar.bz2
-  - sudo mv phantomjs-1.8.2-linux-x86_64/bin/phantomjs bin/phantomjs182
-  - ls -la bin/phantomjs182
-  - bin/phantomjs182 --version
-  - echo "installing PhantomJS 1.9.0"
-  - wget http://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2
-  - tar -xvf phantomjs-1.9.0-linux-x86_64.tar.bz2
-  - sudo mv phantomjs-1.9.0-linux-x86_64/bin/phantomjs bin/phantomjs190
-  - bin/phantomjs190 --version
-  - ls -la bin/phantomjs190
-  - echo "installing PhantomJS 1.9.1"
-  - wget http://phantomjs.googlecode.com/files/phantomjs-1.9.1-linux-x86_64.tar.bz2
-  - tar -xvf phantomjs-1.9.1-linux-x86_64.tar.bz2
-  - sudo mv phantomjs-1.9.1-linux-x86_64/bin/phantomjs bin/phantomjs191
-  - bin/phantomjs191 --version
-  - ls -la bin/phantomjs191
-  - echo "installing PhantomJS 1.9.2"
-  - wget http://phantomjs.googlecode.com/files/phantomjs-1.9.2-linux-x86_64.tar.bz2
-  - tar -xvf phantomjs-1.9.2-linux-x86_64.tar.bz2
-  - sudo mv phantomjs-1.9.2-linux-x86_64/bin/phantomjs bin/phantomjs192
-  - bin/phantomjs192 --version
-  - ls -la bin/phantomjs192
+  - if [[ $ENGINE == 'phantomjs' ]]; then export ENGINE_DOWNLOAD='http://phantomjs.googlecode.com/files'; fi
+  - if [[ $ENGINE == 'slimerjs' ]]; then export ENGINE_DOWNLOAD='http://download.slimerjs.org/v0.8'; fi
+
+  - echo "Installing $ENGINE $ENGINE_VERSION"
+  - wget $(echo $ENGINE_DOWNLOAD)/$(echo $ENGINE)-$(echo $ENGINE_VERSION)-linux-x86_64.tar.bz2 --output-document=engine.tar.bz2
+  - mkdir engine && tar --strip-components=1 -xvf engine.tar.bz2 -C engine
+
+  - if [[ $ENGINE == 'phantomjs' ]]; then ls -la engine/bin/phantomjs && engine/bin/phantomjs --version; fi
+  - if [[ $ENGINE == 'slimerjs' ]]; then ls -la engine/slimerjs && engine/slimerjs --version; fi
+
+install:
   - sudo apt-get install -qq mono-devel mono-mcs
 
 before_script:
   - "npm install -g jshint@2.0.1"
-  - bin/phantomjs182 --version
-  - bin/phantomjs190 --version
-  - bin/phantomjs191 --version
-  - bin/phantomjs192 --version
 
 script:
   - make test
@@ -42,10 +25,13 @@ script:
 
 env:
   matrix:
-    - PHANTOMJS_EXECUTABLE="bin/phantomjs182 --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
-    - PHANTOMJS_EXECUTABLE="bin/phantomjs190 --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
-    - PHANTOMJS_EXECUTABLE="bin/phantomjs191 --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
-    - PHANTOMJS_EXECUTABLE="bin/phantomjs192 --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
+    - ENGINE="phantomjs" ENGINE_VERSION="1.8.2"
+    - ENGINE="phantomjs" ENGINE_VERSION="1.9.0"
+    - ENGINE="phantomjs" ENGINE_VERSION="1.9.1"
+    - ENGINE="phantomjs" ENGINE_VERSION="1.9.2"
+  global:
+    - PHANTOMJS_EXECUTABLE="engine/bin/phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
+    - SLIMERJS_EXECUTABLE="engine/slimerjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
 
 notifications:
   irc: