Merge pull request #714 from n1k0/add-slimer-to-travis-build

Added slimerjs to travis build matrix - refs #594

@@ -3,11 +3,8 @@ branches:
     - "master"
 
 before_install:
-  - 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
+  - echo "Installing $ENGINE $ENGINE_VERSION from $ENGINE_ARCHIVE_URL"
+  - wget $ENGINE_ARCHIVE_URL --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
@@ -25,13 +22,11 @@ script:
 
 env:
   matrix:
-    - 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"
+    - ENGINE="phantomjs" ENGINE_VERSION="1.8.2" ENGINE_EXECUTABLE="engine/bin/phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes" ENGINE_ARCHIVE_URL="https://phantomjs.googlecode.com/files/phantomjs-1.8.2-linux-x86_64.tar.bz2"
+    - ENGINE="phantomjs" ENGINE_VERSION="1.9.0" ENGINE_EXECUTABLE="engine/bin/phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes" ENGINE_ARCHIVE_URL="https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2"
+    - ENGINE="phantomjs" ENGINE_VERSION="1.9.1" ENGINE_EXECUTABLE="engine/bin/phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes" ENGINE_ARCHIVE_URL="https://phantomjs.googlecode.com/files/phantomjs-1.9.1-linux-x86_64.tar.bz2"
+    - ENGINE="phantomjs" ENGINE_VERSION="1.9.2" ENGINE_EXECUTABLE="engine/bin/phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes" ENGINE_ARCHIVE_URL="https://phantomjs.googlecode.com/files/phantomjs-1.9.2-linux-x86_64.tar.bz2"
+    - ENGINE="slimerjs" ENGINE_VERSION="0.8.4" ENGINE_EXECUTABLE="engine/slimerjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes" ENGINE_ARCHIVE_URL="http://download.slimerjs.org/v0.8/0.8.4/slimerjs-0.8.4-linux-x86_64.tar.bz2"
 
 notifications:
   irc:

@@ -9,12 +9,13 @@ import unittest
 TEST_ROOT = os.path.abspath(os.path.dirname(__file__))
 CASPERJS_ROOT = os.path.abspath(os.path.join(TEST_ROOT, '..', '..'))
 CASPER_EXEC = os.path.join(CASPERJS_ROOT, 'bin', 'casperjs')
-PHANTOMJS_EXEC = os.environ['PHANTOMJS_EXECUTABLE']
+ENGINE_EXEC = os.environ.get('ENGINE_EXECUTABLE',
+                             os.environ.get('PHANTOMJS_EXECUTABLE',
+                                            "phantomjs"))
 # make it to an absolute path, because some test change the working directory
 # and relative path to phantomjs would be invalid
-if not os.path.isabs(PHANTOMJS_EXEC):
-    os.environ['PHANTOMJS_EXECUTABLE'] = os.path.join(CASPERJS_ROOT,
-                                                      PHANTOMJS_EXEC)
+if not os.path.isabs(ENGINE_EXEC):
+    os.environ['ENGINE_EXECUTABLE'] = os.path.join(CASPERJS_ROOT, ENGINE_EXEC)
 
 class TimeoutException(Exception):
     pass