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

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

Issue 29874649: Issue 6822 - Report browser test errors (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Minor reformat Created Sept. 14, 2018, 12:37 a.m.
Right Patch Set: throw instead of Promise.reject() Created Sept. 21, 2018, 3:39 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_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
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 function executeScript(driver, name, script, scriptName, scriptArgs) 20 function executeScript(driver, name, script, scriptName, scriptArgs)
21 { 21 {
22 let realScript = `let f = ${script} 22 let realScript = `let f = ${script}
23 let callback = arguments[arguments.length - 1]; 23 let callback = arguments[arguments.length - 1];
24 return Promise.resolve() 24 return Promise.resolve()
25 .then(() => f(...arguments)) 25 .then(() => f(...arguments))
26 .then(() => callback());`; 26 .then(() => callback());`;
27 return driver.executeScript(`let oldLog = console.log; 27 return driver.executeScript(`let oldLog = console.log;
28 console.log = msg => { 28 console.log = msg => {
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 result.log.forEach(item => console.log(item)); 37 for (let item of result.log)
Sebastian Noack 2018/09/17 16:18:06 Nit: We generally prefer for..of loops of .forEach
hub 2018/09/18 22:23:36 Done.
38 if (result.failures != 0) 38 console.log(item);
39 return Promise.reject("Test failure"); 39 return driver.quit().then(() =>
40 }) 40 {
41 .finally(() => driver.quit()); 41 if (result.failures != 0)
Sebastian Noack 2018/09/17 16:18:06 .finally() requires Node.js 10, but we still suppo
hub 2018/09/18 22:23:36 I have run this on Node 7 and 8 and it did work. I
Sebastian Noack 2018/09/19 08:16:50 I'm on Node.js 8.5.0 and Promise.resolve().finally
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 });
42 } 53 }
43 54
44 module.exports.executeScript = executeScript; 55 module.exports.executeScript = executeScript;
LEFTRIGHT

Powered by Google App Engine
This is Rietveld