Issue 5079, 5516 - Use webpack for browser tests, modules for content scripts

test_runner.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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
@@ skipping 32 matching lines @@
         addTestPaths(fs.readdirSync(testPath).map(
           file => path.join(testPath, file)));
       }
       continue;
     }
     if (path.basename(testPath).startsWith("_"))
       continue;
     if (path.extname(testPath) == ".js")
     {
       if (testPath.split(path.sep).includes("browser"))
-      {
-        browserFiles.push(
-          path.relative(path.join(__dirname, "test", "browser"),
-                        testPath).replace(/\.js$/, "")
-        );
-      }
+        browserFiles.push(testPath);
       else
         unitFiles.push(testPath);
     }
   }
 }
 
 function webpackInMemory(bundleFilename, options)
 {
   return new Promise((resolve, reject) =>
   {
-    // Based on this example https://webpack.js.org/api/node/#custom-file-systems
+    // Based on this example
+    // https://webpack.js.org/api/node/#custom-file-systems
     let memoryFS = new MemoryFS();
 
     options.output = {filename: bundleFilename, path: "/"};
     let webpackCompiler = webpack(options);
     webpackCompiler.outputFileSystem = memoryFS;
 
     webpackCompiler.run((err, stats) =>
     {
       // Error handling is based on this example
       // https://webpack.js.org/api/node/#error-handling
@@ skipping 12 matching lines @@
         memoryFS.unlinkSync("/" + bundleFilename);
         resolve(bundle);
       }
     });
   });
 }
 
 function runBrowserTests()
 {
   if (!browserFiles.length)
-    return Promise.resolve();

[Wladimir Palant, 2017/08/17 13:06:11]

Or maybe just change the call below from runBrowserTests() to
Promise.resolve(runBrowserTests()) again?

[kzar, 2017/08/17 13:26:43]

Done.

+    return;
 
   let nodeunitPath = path.join(__dirname, "node_modules", "nodeunit",
                                "examples", "browser", "nodeunit.js");
   let bundleFilename = "bundle.js";
 
   return webpackInMemory(bundleFilename, {
     entry: path.join(__dirname, "test", "browser", "_bootstrap.js"),
     module: {
       rules: [{
         resource: nodeunitPath,
-        // I would have rathered used exports-loader here, to avoid treating
+        // I would have rather used exports-loader here, to avoid treating
         // nodeunit as a global. Unfortunately the nodeunit browser example
         // script is quite slopily put together, if exports isn't falsey it
         // breaks! As a workaround we need to use script-loader, which means
         // that exports is falsey for that script as a side-effect.
         use: ["script-loader"]
       }]
     },
     resolve: {
       alias: {
         nodeunit$: nodeunitPath
       },
       modules: [path.resolve(__dirname, "lib")]
     }
   }).then(bundle =>
   {
-    return chromiumProcess(bundle, bundleFilename, browserFiles);
+    return chromiumProcess(
+      bundle, bundleFilename,
+      browserFiles.map(
+        file => path.relative(path.join(__dirname, "test", "browser"),
+                              file).replace(/\.js$/, "")
+      )
+    );
   });
 }
 
 if (process.argv.length > 2)
   addTestPaths(process.argv.slice(2), true);
 else
 {
   addTestPaths(
     [path.join(__dirname, "test"), path.join(__dirname, "test", "browser")],
     true
   );
 }
 
-runBrowserTests().catch(error =>
+Promise.resolve(runBrowserTests()).catch(error =>
 {
   console.error("Failed running browser tests");
   console.error(error);
 }).then(() =>
 {
   if (unitFiles.length)
     nodeunit.reporters.default.run(unitFiles);
 });