Issue 6887 - add Chrome to "npm test"

test/browsers/firefox.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 const FIREFOX_VERSION = "57.0";
 
-const path = require("path");
 const webdriver = require("selenium-webdriver");
 const firefox = require("selenium-webdriver/firefox");
 const {Command} = require("selenium-webdriver/lib/command");
 const {ensureFirefox} = require("../../adblockpluscore/test/runners/" +
                                 "firefox_download");
 
 exports.platform = "gecko";
 
-exports.getDriver = function()
+exports.ensureBrowser = function()
 {
-  return ensureFirefox(FIREFOX_VERSION).then(firefoxPath =>
-  {
-    let binary = new firefox.Binary(firefoxPath);
-    binary.addArguments("-headless");
+  return ensureFirefox(FIREFOX_VERSION);
+};
 
-    let driver = new webdriver.Builder()
-      .forBrowser("firefox")
-      .setFirefoxOptions(new firefox.Options().setBinary(binary))
-      .build();
+exports.getDriver = function(browserBinary, devenvPath)
+{
+  let binary = new firefox.Binary(browserBinary);
+  binary.addArguments("-headless");
 
-    let devenv = "./devenv.gecko";
-    let cmd = new Command("moz-install-web-ext")
-      .setParameter("path", path.resolve(devenv))
-      .setParameter("temporary", true);
+  let driver = new webdriver.Builder()
+    .forBrowser("firefox")
+    .setFirefoxOptions(new firefox.Options().setBinary(binary))
+    .build();
 
-    driver.getExecutor().defineCommand(
-      cmd.getName(), "POST",
-      "/session/:sessionId/moz/addon/install"
-    );
-    driver.schedule(cmd, `installWebExt(${devenv})`);
+  let cmd = new Command("moz-install-web-ext")
+    .setParameter("path", devenvPath)
+    .setParameter("temporary", true);
 
-    return driver;
-  });
+  driver.getExecutor().defineCommand(
+    cmd.getName(), "POST",
+    "/session/:sessionId/moz/addon/install"
+  );
+  driver.schedule(cmd, `installWebExt(${devenvPath})`);
+
+  return driver;
 };