Left: | ||
Right: |
LEFT | RIGHT |
---|---|
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 FIREFOX_VERSION = "57.0"; | 20 const FIREFOX_VERSION = "57.0"; |
21 | 21 |
22 const path = require("path"); | 22 const path = require("path"); |
23 const webdriver = require("selenium-webdriver"); | 23 const webdriver = require("selenium-webdriver"); |
24 const {By, until} = webdriver; | 24 const {By, until} = webdriver; |
25 const firefox = require("selenium-webdriver/firefox"); | 25 const firefox = require("selenium-webdriver/firefox"); |
26 const {Command} = require("selenium-webdriver/lib/command"); | 26 const {Command} = require("selenium-webdriver/lib/command"); |
27 const {ensureFirefox} = require("../adblockpluscore/test/runners/" + | 27 const {ensureFirefox} = require("../adblockpluscore/test/runners/" + |
28 "firefox_download"); | 28 "firefox_download"); |
29 | 29 |
30 | 30 function reportElements(test, driver, success) |
31 function reportElements(test, driver, css, success) | |
32 { | 31 { |
33 return driver.findElements(By.css(css)). | 32 return driver.findElements( |
34 then(elements => Promise.all(elements.map(elem => | 33 By.css(`#qunit-tests ${success ? ".pass" : ".fail"} .test-name`) |
35 elem.getAttribute("innerHTML").then(data => test.ok(success, data))))); | 34 ).then(elements => Promise.all(elements.map(elem => |
35 elem.getAttribute("innerHTML").then(data => test.ok(success, data)) | |
36 ))); | |
36 } | 37 } |
37 | 38 |
38 exports.runFirefox = function(test) | 39 exports.runFirefox = function(test) |
39 { | 40 { |
40 // https://stackoverflow.com/a/45045036 | 41 // https://stackoverflow.com/a/45045036 |
41 function installWebExt(driver, extension) | 42 function installWebExt(driver, extension) |
42 { | 43 { |
43 let cmd = new Command("moz-install-web-ext") | 44 let cmd = new Command("moz-install-web-ext") |
44 .setParameter("path", path.resolve(extension)) | 45 .setParameter("path", path.resolve(extension)) |
45 .setParameter("temporary", true); | 46 .setParameter("temporary", true); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
82 // Navigate to the qunit index | 83 // Navigate to the qunit index |
83 driver.executeScript("location.href = \"qunit/index.html\";") | 84 driver.executeScript("location.href = \"qunit/index.html\";") |
84 ).then(() => | 85 ).then(() => |
85 // Wait for qunit-results to be present | 86 // Wait for qunit-results to be present |
86 driver.wait(until.elementLocated(By.id("qunit-testresult"))) | 87 driver.wait(until.elementLocated(By.id("qunit-testresult"))) |
87 ).then(() => | 88 ).then(() => |
88 // Wait for tests to finish | 89 // Wait for tests to finish |
89 driver.wait(() => | 90 driver.wait(() => |
90 driver.findElement(By.id("qunit-testresult")) | 91 driver.findElement(By.id("qunit-testresult")) |
91 .getAttribute("innerHTML").then(data => | 92 .getAttribute("innerHTML").then(data => |
92 data.search("Tests completed") >= 0)) | 93 data.includes("Tests completed"))) |
Sebastian Noack
2018/08/24 12:29:10
If you use .includes() instead of .search() you ge
tlucas
2018/08/24 12:46:22
Done.
| |
93 ).then(() => Promise.all([ | 94 ).then(() => Promise.all([ |
94 reportElements(test, driver, "#qunit-tests .pass .test-name", true), | 95 reportElements(test, driver, true), |
95 reportElements(test, driver, "#qunit-tests .fail .test-name", false) | 96 reportElements(test, driver, false) |
Sebastian Noack
2018/08/24 12:29:11
You could make it even a little more DRY by removi
tlucas
2018/08/24 12:46:21
Good point, done.
| |
96 ])).then(() => | 97 ])).then(() => |
97 { | 98 { |
98 driver.quit(); | 99 driver.quit(); |
99 test.done(); | 100 test.done(); |
100 }).catch((err) => | 101 }, err => |
101 { | |
102 driver.quit().then(() => | 102 driver.quit().then(() => |
103 { | 103 { |
104 throw err; | 104 throw err; |
105 }); | 105 }) |
106 }); | 106 ); |
107 }); | 107 }); |
108 }; | 108 }; |
LEFT | RIGHT |