Issue 6887 - add Chrome to "npm test"

test/all.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/>.
  */
 
-/* eslint-env mocha */
-
 "use strict";
 
 const glob = require("glob");
 const path = require("path");
 const {exec} = require("child_process");
 
 for (let browser of glob.sync("./test/browsers/*.js"))
 {
   let module = require(path.resolve(browser));
 
   describe(module.platform, function()
   {
     this.timeout(0);
 
     before(function()
     {
-      return new Promise((resolve, reject) =>
+      return Promise.all([
+        module.ensureBrowser(),
+        new Promise((resolve, reject) =>
+        {
+          exec(`python build.py devenv -t ${module.platform}`,
+            (error, stdout, stderr) =>
+            {
+              if (error)
+              {
+                console.error(stderr);
+                reject(error);
+              }
+              else resolve(stdout);
+            });
+        })
+      ]).then(([browserBinary]) =>
       {
-        exec(`python build.py devenv -t ${module.platform}`,
-          (error, stdout, stderr) =>
-          {
-            if (error)
-            {
-              console.error(stderr);
-              reject(error);
-            }
-            else resolve(stdout);
-          });
-      }).then(() => module.getDriver(
-        path.resolve(`./devenv.${module.platform}`)).then(d =>
-        {
-          this.driver = d;

[Sebastian Noack, 2018/09/01 10:42:47]

Nit: The reason we called the argument "d" (rather than "driver") was to avoid a
name conflict. But since we assign to this.driver now, we can spell out "driver"
again. Same below for "o" => "origin".

[tlucas, 2018/09/01 11:54:23]

Done.

-          return this.driver.wait(() =>
-            this.driver.getAllWindowHandles().then(handles => handles[1])
-          );
-        }).then(handle =>
-          this.driver.switchTo().window(handle)
-        ).then(() =>
-          this.driver.executeScript("return location.origin;")
-        ).then(o =>
-        {
-          this.origin = o;
-          this.platform = module.platform;
-        }));
+        this.driver = module.getDriver(
+          browserBinary,
+          path.resolve(`./devenv.${module.platform}`)
+        );
+        return this.driver.wait(() =>
+          this.driver.getAllWindowHandles().then(handles => handles[1])
+        );
+      }).then(handle =>
+        this.driver.switchTo().window(handle)
+      ).then(() =>
+        this.driver.executeScript("return location.origin;")
+      ).then(origin =>
+      {
+        this.origin = origin;
+      });
     });
 
     for (let file of glob.sync("./test/wrappers/*.js"))
     {
       // Reload the module(s) for every browser
-      delete require.cache[require.resolve(path.resolve(file))];

[Sebastian Noack, 2018/09/01 10:42:47]

Why would they already be in cache? Isn't this the first time we import them?

[tlucas, 2018/09/01 11:54:24]

We (want to) require them 2 times currently, once for Firefox, once for Chrome,
so that it() is actually executed 2 times.

You could argue that deleting this from the cache is only necessary after it was
once required, but that would add some boilerplate here.

[Sebastian Noack, 2018/09/01 12:26:33]

Acknowledged.

-      require(path.resolve(file));
+      let modulePath = path.resolve(file);
+      delete require.cache[require.resolve(modulePath)];
+      require(modulePath);
     }
 
     after(function()
     {
       this.driver.quit();
     });
   });
 }