| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 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 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 87 driver.wait(until.elementLocated(By.id("qunit-testresult"))) | 87 driver.wait(until.elementLocated(By.id("qunit-testresult"))) |
| 88 ).then(() => | 88 ).then(() => |
| 89 // Wait for tests to finish | 89 // Wait for tests to finish |
| 90 driver.wait(() => | 90 driver.wait(() => |
| 91 driver.findElement(By.id("qunit-testresult")) | 91 driver.findElement(By.id("qunit-testresult")) |
| 92 .getAttribute("innerHTML").then(data => | 92 .getAttribute("innerHTML").then(data => |
| 93 data.includes("Tests completed"))) | 93 data.includes("Tests completed"))) |
| 94 ).then(() => Promise.all([ | 94 ).then(() => Promise.all([ |
| 95 reportElements(test, driver, true), | 95 reportElements(test, driver, true), |
| 96 reportElements(test, driver, false) | 96 reportElements(test, driver, false) |
| 97 ])).then(() => | 97 ])).then( |
| 98 { | 98 () => driver.quit().then(() => test.done()), |
| 99 driver.quit(); | 99 err => driver.quit().then(() => { throw err; }) |
|
tlucas
2018/08/25 09:36:01
Our coding-style (https://adblockplus.org/en/codin
Sebastian Noack
2018/08/25 09:51:38
One liners are fine too.
| |
| 100 test.done(); | |
| 101 }, err => | |
| 102 driver.quit().then(() => | |
| 103 { | |
| 104 throw err; | |
| 105 }) | |
| 106 ); | 100 ); |
| 107 }); | 101 }); |
| 108 }; | 102 }; |
| OLD | NEW |