Merge pull request #136 from marco-c/remove_chrome_env_var

Remove CHROME env var

Author: marco-c

.travis.yml

@@ -7,8 +7,8 @@ env:
     - MOZ_XVFB=$(if [[ $TRAVIS_OS_NAME == "linux" ]]; then echo 1; fi)
   matrix:
     - NODE_VERSION="0.12"
-    - NODE_VERSION="4" CHROME="nightly"
-    - NODE_VERSION="stable" CHROME="nightly"
+    - NODE_VERSION="4"
+    - NODE_VERSION="stable"
 before_install:
   - rm -rf ~/.nvm
   - git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`)

test/testSelenium.js

@@ -131,20 +131,14 @@ suite('selenium', function() {
     promises.push(seleniumInit.downloadFirefoxNightly());
 
     if (process.env.GCM_API_KEY) {
-      chromeBinaryPath = process.env.CHROME;
-      if (chromeBinaryPath === 'nightly') {
-        if (process.platform === 'linux') {
-          chromeBinaryPath = 'test_tools/chrome-linux/chrome';
-        } else if (process.platform === 'darwin') {
-          chromeBinaryPath = 'test_tools/chrome-mac/Chromium.app/Contents/MacOS/Chromium';
-        }
-
-        promises.push(seleniumInit.downloadChromiumNightly());
-      } else if (chromeBinaryPath === 'all') {
-        // TODO: Download Chromium release.
-        chromeBinaryPath = childProcess.execSync('which chromium-browser').toString().replace('\n', '');
+      if (process.platform === 'linux') {
+        chromeBinaryPath = 'test_tools/chrome-linux/chrome';
+      } else if (process.platform === 'darwin') {
+        chromeBinaryPath = 'test_tools/chrome-mac/Chromium.app/Contents/MacOS/Chromium';
       }
 
+      promises.push(seleniumInit.downloadChromiumNightly());
+
       promises.push(seleniumInit.downloadChromeDriver());
     }