| 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-2016 Eyeo GmbH | 3  * Copyright (C) 2006-2016 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 | 
| 11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| 12  * GNU General Public License for more details. | 12  * GNU General Public License for more details. | 
| 13  * | 13  * | 
| 14  * You should have received a copy of the GNU General Public License | 14  * You should have received a copy of the GNU General Public License | 
| 15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 
| 16  */ | 16  */ | 
| 17 | 17 | 
| 18 "use strict"; | 18 "use strict"; | 
| 19 | 19 | 
| 20 let fs = require("fs"); | 20 let fs = require("fs"); | 
| 21 let path = require("path"); | 21 let path = require("path"); | 
| 22 let process = require("process"); | 22 let process = require("process"); | 
| 23 let nodeunit = require("nodeunit"); | 23 let nodeunit = require("nodeunit"); | 
|  | 24 let qunit = require("node-qunit-phantomjs"); | 
| 24 | 25 | 
| 25 let files = []; | 26 let nodeunitFiles = []; | 
|  | 27 let qunitFiles = []; | 
| 26 function addTestPaths(testPaths, recurse) | 28 function addTestPaths(testPaths, recurse) | 
| 27 { | 29 { | 
| 28   for (let testPath of testPaths) | 30   for (let testPath of testPaths) | 
| 29   { | 31   { | 
| 30     let stat = fs.statSync(testPath); | 32     let stat = fs.statSync(testPath); | 
| 31     if (stat.isDirectory()) | 33     if (stat.isDirectory()) | 
| 32     { | 34     { | 
| 33       if (recurse) | 35       if (recurse) | 
| 34       { | 36       { | 
| 35         addTestPaths(fs.readdirSync(testPath).map( | 37         addTestPaths(fs.readdirSync(testPath).map( | 
| 36           file => path.join(testPath, file))); | 38           file => path.join(testPath, file))); | 
| 37       } | 39       } | 
|  | 40       continue; | 
| 38     } | 41     } | 
| 39     else if (path.extname(testPath) == ".js" && | 42     if (path.basename(testPath).startsWith("_")) | 
| 40              !path.basename(testPath).startsWith("_")) | 43       continue; | 
|  | 44     if (testPath.split(path.sep).includes("browser")) | 
| 41     { | 45     { | 
| 42       files.push(testPath); | 46       if (path.extname(testPath) == ".html") | 
|  | 47         qunitFiles.push(testPath); | 
| 43     } | 48     } | 
|  | 49     else if (path.extname(testPath) == ".js") | 
|  | 50       nodeunitFiles.push(testPath); | 
| 44   } | 51   } | 
| 45 } | 52 } | 
| 46 if (process.argv.length > 2) | 53 if (process.argv.length > 2) | 
| 47   addTestPaths(process.argv.slice(2), true); | 54   addTestPaths(process.argv.slice(2), true); | 
| 48 else | 55 else | 
| 49   addTestPaths([path.join(__dirname, "test")], true); | 56   addTestPaths( | 
|  | 57     [path.join(__dirname, "test"), path.join(__dirname, "test", "browser")], | 
|  | 58     true); | 
| 50 | 59 | 
| 51 nodeunit.reporters.default.run(files); | 60 if (nodeunitFiles.length) | 
|  | 61   nodeunit.reporters.default.run(nodeunitFiles); | 
|  | 62 qunitFiles.forEach(file => qunit(path.resolve(file))); | 
| OLD | NEW | 
|---|