Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: test/runners/firefox_process.js

Issue 29858555: Issue 6391 - WebDriver: Fix runtime problen with Gecko and Firefox (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Created Aug. 17, 2018, 12:30 p.m.
Right Patch Set: Updated comments Created Aug. 22, 2018, 5:36 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « test/runners/chromium_process.js ('k') | test_runner.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
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
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 const {Builder} = require("selenium-webdriver"); 20 const {Builder} = require("selenium-webdriver");
21 const firefox = require("selenium-webdriver/firefox"); 21 const firefox = require("selenium-webdriver/firefox");
22 require("geckodriver"); 22 require("geckodriver");
23 23
24 const {executeScript} = require("./webdriver"); 24 const {executeScript} = require("./webdriver");
25 const {ensureFirefox} = require("./firefox_download"); 25 const {ensureFirefox} = require("./firefox_download");
26 26
27 const FIREFOX_VERSION = "56.0"; 27 // Firefox 57 seems to be the minimum to reliably run with WebDriver
28 // on certain system configurations like Debian 9, TravisCI.
29 const FIREFOX_VERSION = "57.0";
28 30
29 function runScript(firefoxPath, script, scriptName, scriptArgs) 31 function runScript(firefoxPath, script, scriptName, scriptArgs)
30 { 32 {
31 let binary = new firefox.Binary(firefoxPath); 33 let binary = new firefox.Binary(firefoxPath);
32 binary.addArguments("-headless"); 34 binary.addArguments("-headless");
33 35
34 const options = new firefox.Options() 36 const options = new firefox.Options()
35 .setBinary(binary); 37 .setBinary(binary);
36 38
37 const driver = new Builder() 39 const driver = new Builder()
38 .forBrowser("firefox") 40 .forBrowser("firefox")
39 .setFirefoxOptions(options) 41 .setFirefoxOptions(options)
40 .build(); 42 .build();
41 43
42 return executeScript(driver, "Firefox", script, scriptName, scriptArgs); 44 return executeScript(driver, "Firefox", script, scriptName, scriptArgs);
43 } 45 }
44 46
45 module.exports = function(script, scriptName, ...scriptArgs) 47 module.exports = function(script, scriptName, ...scriptArgs)
46 { 48 {
47 return ensureFirefox(FIREFOX_VERSION).then(firefoxPath => 49 return ensureFirefox(FIREFOX_VERSION).then(firefoxPath =>
48 { 50 {
49 return runScript(firefoxPath, script, scriptName, scriptArgs) 51 return runScript(firefoxPath, script, scriptName, scriptArgs)
50 .then(result => result) 52 .then(result => result)
51 .catch(error => 53 .catch(error =>
52 { 54 {
53 throw error; 55 throw error;
54 }); 56 });
55 }); 57 });
56 }; 58 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld