| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| (Empty) | |
| 1 /* | |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | |
| 3 * Copyright (C) 2006-present eyeo GmbH | |
| 4 * | |
| 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 | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 * GNU General Public License for more details. | |
| 13 * | |
| 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/>. | |
| 16 */ | |
| 17 | |
| 18 "use strict"; | |
| 19 | |
| 20 const {Builder} = require("selenium-webdriver"); | |
| 21 const firefox = require("selenium-webdriver/firefox"); | |
| 22 require("geckodriver"); | |
| 23 | |
| 24 const {executeScript} = require("./webdriver"); | |
| 25 const {ensureFirefox} = require("./firefox_download"); | |
| 26 | |
| 27 const FIREFOX_VERSION = "60.0b4"; | |
| 28 | |
| 29 function runScript(firefoxPath, script, scriptName, scriptArgs) | |
| 30 { | |
| 31 let binary = new firefox.Binary(firefoxPath); | |
| 32 binary.addArguments("-headless"); | |
| 33 | |
| 34 const options = new firefox.Options() | |
| 35 .setBinary(binary); | |
| 36 | |
| 37 const driver = new Builder() | |
| 38 .forBrowser("firefox") | |
| 39 .setFirefoxOptions(options) | |
| 40 .build(); | |
| 41 | |
| 42 return executeScript(driver, "Firefox", script, scriptName, scriptArgs); | |
| 43 } | |
| 44 | |
| 45 module.exports = function(script, scriptName, ...scriptArgs) | |
| 46 { | |
| 47 return ensureFirefox(FIREFOX_VERSION).then(firefoxPath => | |
| 48 { | |
| 49 return runScript(firefoxPath, script, scriptName, scriptArgs) | |
| 50 .then(result => | |
| 51 { | |
| 52 return result; | |
|
kzar
2018/05/04 10:52:43
Nit: I guess you could omit the curly braces and t
hub
2018/05/18 00:04:22
Done.
| |
| 53 }).catch(error => | |
| 54 { | |
| 55 throw error; | |
| 56 }); | |
| 57 }); | |
| 58 }; | |
| OLD | NEW |