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

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

Issue 29720661: Issue 6391 - Allow running the browser unit tests with Firefox (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Support using chromium with webdriver. Created March 16, 2018, 8:56 p.m.
Right Patch Set: Update Firefox version in README Created Aug. 3, 2018, 4:15 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « test/runners/firefox_download.js ('k') | test/runners/webdriver.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
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 /* eslint-env node */
19
20 "use strict"; 18 "use strict";
21 19
22 const {Builder} = require("selenium-webdriver"); 20 const {Builder} = require("selenium-webdriver");
23 const firefox = require("selenium-webdriver/firefox"); 21 const firefox = require("selenium-webdriver/firefox");
24 require("geckodriver"); 22 require("geckodriver");
23
25 const {executeScript} = require("./webdriver"); 24 const {executeScript} = require("./webdriver");
25 const {ensureFirefox} = require("./firefox_download");
26 26
27 function runScript(script, scriptName, scriptArgs) 27 const FIREFOX_VERSION = "56.0";
28
29 function runScript(firefoxPath, script, scriptName, scriptArgs)
28 { 30 {
29 let binary = new firefox.Binary(firefox.Channel.NIGHTLY); 31 let binary = new firefox.Binary(firefoxPath);
30 binary.addArguments("-headless"); 32 binary.addArguments("-headless");
31 33
32 const options = new firefox.Options() 34 const options = new firefox.Options()
33 .setBinary(binary); 35 .setBinary(binary);
34 36
35 const driver = new Builder() 37 const driver = new Builder()
36 .forBrowser("firefox") 38 .forBrowser("firefox")
37 .setFirefoxOptions(options) 39 .setFirefoxOptions(options)
38 .build(); 40 .build();
39 41
40 return executeScript(driver, "Firefox", script, scriptName, scriptArgs); 42 return executeScript(driver, "Firefox", script, scriptName, scriptArgs);
41 } 43 }
42 44
43 module.exports = function(script, scriptName, ...scriptArgs) 45 module.exports = function(script, scriptName, ...scriptArgs)
44 { 46 {
45 return runScript(script, scriptName, scriptArgs).then(result => 47 return ensureFirefox(FIREFOX_VERSION).then(firefoxPath =>
46 { 48 {
47 return result; 49 return runScript(firefoxPath, script, scriptName, scriptArgs)
48 }).catch(error => 50 .then(result => result)
49 { 51 .catch(error =>
50 throw error; 52 {
53 throw error;
54 });
51 }); 55 });
52 }; 56 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld