| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-present eyeo GmbH | 3  * Copyright (C) 2006-present eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
| 40   chromium: chromiumProcess, | 40   chromium: chromiumProcess, | 
| 41   firefox: firefoxProcess | 41   firefox: firefoxProcess | 
| 42 }; | 42 }; | 
| 43 | 43 | 
| 44 function configureRunners() | 44 function configureRunners() | 
| 45 { | 45 { | 
| 46   let runners = "BROWSER_TEST_RUNNERS" in process.env ? | 46   let runners = "BROWSER_TEST_RUNNERS" in process.env ? | 
| 47       process.env.BROWSER_TEST_RUNNERS.split(",") : []; | 47       process.env.BROWSER_TEST_RUNNERS.split(",") : []; | 
| 48 | 48 | 
| 49   if (runners.length == 0) | 49   if (runners.length == 0) | 
| 50     return ["chromium_remote"]; | 50     return ["chromium_remote", "firefox"]; | 
| 51 | 51 | 
| 52   return runners.filter(runner => runnerDefinitions.hasOwnProperty(runner)); | 52   return runners.filter(runner => runnerDefinitions.hasOwnProperty(runner)); | 
| 53 } | 53 } | 
| 54 | 54 | 
| 55 let runnerProcesses = configureRunners(); | 55 let runnerProcesses = configureRunners(); | 
| 56 | 56 | 
| 57 function addTestPaths(testPaths, recurse) | 57 function addTestPaths(testPaths, recurse) | 
| 58 { | 58 { | 
| 59   for (let testPath of testPaths) | 59   for (let testPath of testPaths) | 
| 60   { | 60   { | 
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 173 | 173 | 
| 174 Promise.resolve(runBrowserTests(runnerProcesses)).catch(error => | 174 Promise.resolve(runBrowserTests(runnerProcesses)).catch(error => | 
| 175 { | 175 { | 
| 176   console.error("Failed running browser tests"); | 176   console.error("Failed running browser tests"); | 
| 177   console.error(error); | 177   console.error(error); | 
| 178 }).then(() => | 178 }).then(() => | 
| 179 { | 179 { | 
| 180   if (unitFiles.length) | 180   if (unitFiles.length) | 
| 181     nodeunit.reporters.default.run(unitFiles); | 181     nodeunit.reporters.default.run(unitFiles); | 
| 182 }); | 182 }); | 
| OLD | NEW | 
|---|