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 11 matching lines...) Expand all Loading... |
22 let realScript = `let f = ${script} | 22 let realScript = `let f = ${script} |
23 let callback = arguments[arguments.length - 1]; | 23 let callback = arguments[arguments.length - 1]; |
24 return Promise.resolve() | 24 return Promise.resolve() |
25 .then(() => f(...arguments)) | 25 .then(() => f(...arguments)) |
26 .then(() => callback());`; | 26 .then(() => callback());`; |
27 return driver.executeScript(`let oldLog = console.log; | 27 return driver.executeScript(`let oldLog = console.log; |
28 console.log = msg => { | 28 console.log = msg => { |
29 window._consoleLogs.log.push(msg); | 29 window._consoleLogs.log.push(msg); |
30 oldLog.call(this, msg); | 30 oldLog.call(this, msg); |
31 };`) | 31 };`) |
32 .then(() => driver.executeAsyncScript(realScript, scriptArgs)) | 32 .then(() => driver.executeAsyncScript(realScript, ...scriptArgs)) |
33 .then(() => driver.executeScript("return window._consoleLogs;")) | 33 .then(() => driver.executeScript("return window._consoleLogs;")) |
34 .then(result => | 34 .then(result => |
35 { | 35 { |
36 console.log(`\nBrowser tests in ${name}\n`); | 36 console.log(`\nBrowser tests in ${name}\n`); |
37 for (let item of result.log) | 37 for (let item of result.log) |
38 console.log(item); | 38 console.log(item); |
39 return driver.quit().then(() => | 39 return driver.quit().then(() => |
40 { | 40 { |
41 if (result.failures != 0) | 41 if (result.failures != 0) |
42 throw name; | 42 throw name; |
43 }); | 43 }); |
44 }, error => | 44 }, error => |
45 { | 45 { |
46 // This could be replaced by Promise.finally() | 46 // This could be replaced by Promise.finally() |
47 // once we require NodeJS >= 10 | 47 // once we require NodeJS >= 10 |
48 return driver.quit().then(() => | 48 return driver.quit().then(() => |
49 { | 49 { |
50 throw error; | 50 throw error; |
51 }); | 51 }); |
52 }); | 52 }); |
53 } | 53 } |
54 | 54 |
55 module.exports.executeScript = executeScript; | 55 module.exports.executeScript = executeScript; |
OLD | NEW |