| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 .forBrowser("chrome") | 44 .forBrowser("chrome") |
| 45 .setChromeOptions(options) | 45 .setChromeOptions(options) |
| 46 .build(); | 46 .build(); |
| 47 | 47 |
| 48 return executeScript(driver, "Chromium (WebDriver)", | 48 return executeScript(driver, "Chromium (WebDriver)", |
| 49 script, scriptName, scriptArgs); | 49 script, scriptName, scriptArgs); |
| 50 } | 50 } |
| 51 | 51 |
| 52 module.exports = function(script, scriptName, ...scriptArgs) | 52 module.exports = function(script, scriptName, ...scriptArgs) |
| 53 { | 53 { |
| 54 return ensureChromium(CHROMIUM_REVISION).then(chromiumPath => | 54 return ensureChromium(CHROMIUM_REVISION) |
| 55 { | 55 .then(chromiumPath => runScript(chromiumPath, script, scriptName, scriptArgs
)); |
| 56 return runScript(chromiumPath, script, scriptName, scriptArgs) | |
| 57 .then(result => result) | |
| 58 .catch(error => | |
| 59 { | |
| 60 throw error; | |
| 61 }); | |
| 62 }); | |
| 63 }; | 56 }; |
| OLD | NEW |