LEFT | RIGHT |
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 18 matching lines...) Expand all Loading... |
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 if (result.failures != 0) | 39 return driver.quit().then(() => |
40 return Promise.reject("Test failure"); | 40 { |
41 }) | 41 if (result.failures != 0) |
42 .finally(() => driver.quit()); | 42 throw name; |
| 43 }); |
| 44 }, error => |
| 45 { |
| 46 // This could be replaced by Promise.finally() |
| 47 // once we require NodeJS >= 10 |
| 48 return driver.quit().then(() => |
| 49 { |
| 50 throw error; |
| 51 }); |
| 52 }); |
43 } | 53 } |
44 | 54 |
45 module.exports.executeScript = executeScript; | 55 module.exports.executeScript = executeScript; |
LEFT | RIGHT |