| Index: test/runners/webdriver.js |
| =================================================================== |
| --- a/test/runners/webdriver.js |
| +++ b/test/runners/webdriver.js |
| @@ -19,26 +19,26 @@ |
| function executeScript(driver, name, script, scriptName, scriptArgs) |
| { |
| let realScript = `let f = ${script} |
| let callback = arguments[arguments.length - 1]; |
| return Promise.resolve() |
| .then(() => f(...arguments)) |
| .then(() => callback());`; |
| - return driver.executeScript(`window.consoleLogs = []; |
| - let oldLog = console.log; |
| + return driver.executeScript(`let oldLog = console.log; |
| console.log = msg => { |
| - window.consoleLogs.push(msg); |
| + window.consoleLogs.log.push(msg); |
| oldLog.call(this, msg); |
| };`) |
| .then(() => driver.executeAsyncScript(realScript, scriptArgs)) |
| .then(() => driver.executeScript("return window.consoleLogs;")) |
| .then(result => |
| { |
| console.log(`\nBrowser tests in ${name}\n`); |
| - result.forEach(item => console.log(item)); |
| + result.log.forEach(item => console.log(item)); |
| + if (result.failures != 0) |
| + return Promise.reject("Test failure"); |
| }) |
| - .then(() => driver.quit()) |
| - ; |
| + .finally(() => driver.quit()); |
| } |
| module.exports.executeScript = executeScript; |