| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| (Empty) | |
| 1 /* | |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | |
| 3 * Copyright (C) 2006-present eyeo GmbH | |
| 4 * | |
| 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 | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 * GNU General Public License for more details. | |
| 13 * | |
| 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/>. | |
| 16 */ | |
| 17 | |
| 18 "use strict"; | |
| 19 | |
| 20 const {ensureFirefox} = require("../adblockpluscore/test/runners/" + | |
| 21 "firefox_download"); | |
| 22 const webdriver = require("selenium-webdriver"); | |
| 23 const {By, until} = webdriver; | |
| 24 | |
| 25 const FIREFOX_VERSION = "57.0"; | |
| 26 | |
| 27 const Command = require("selenium-webdriver/lib/command").Command; | |
|
hub
2018/08/23 12:53:59
you could use destructuring here too.
tlucas
2018/08/23 13:42:14
Could you please explain which lines / how exactly
hub
2018/08/23 14:46:33
change
const Command = require("selenium-webdrive
tlucas
2018/08/23 15:32:05
Thank you!
And no, "npm run lint" did not complai
| |
| 28 const path = require("path"); | |
| 29 const firefox = require("selenium-webdriver/firefox"); | |
| 30 | |
| 31 exports.runFirefox = function(test) | |
| 32 { | |
| 33 // https://stackoverflow.com/a/45045036 | |
| 34 function installWebExt(driver, extension) | |
| 35 { | |
| 36 let cmd = new Command("moz-install-web-ext") | |
| 37 .setParameter("path", path.resolve(extension)) | |
| 38 .setParameter("temporary", true); | |
| 39 | |
| 40 driver.getExecutor() | |
| 41 .defineCommand(cmd.getName(), "POST", | |
| 42 "/session/:sessionId/moz/addon/install"); | |
| 43 | |
| 44 return driver.schedule(cmd, "installWebExt(" + extension + ")"); | |
|
hub
2018/08/23 12:54:00
I'd rather use template a string here:
`installWeb
tlucas
2018/08/23 13:42:15
Done.
| |
| 45 } | |
| 46 | |
| 47 ensureFirefox(FIREFOX_VERSION).then(firefoxPath => | |
| 48 { | |
| 49 let binary = new firefox.Binary(firefoxPath); | |
| 50 | |
| 51 binary.addArguments("-headless"); | |
| 52 | |
| 53 let options = new firefox.Options() | |
| 54 .setBinary(binary); | |
| 55 | |
| 56 let driver = new webdriver.Builder() | |
| 57 .forBrowser("firefox") | |
| 58 .setFirefoxOptions(options) | |
| 59 .build(); | |
| 60 | |
| 61 installWebExt(driver, "./devenv.gecko"); | |
| 62 | |
| 63 driver.wait(() => | |
| 64 // Wait for the firstrun-page to be loaded | |
| 65 driver.getAllWindowHandles().then(handles => | |
| 66 { | |
| 67 if (handles.length > 1) | |
| 68 { | |
| 69 driver.switchTo().window(handles[1]); | |
| 70 return true; | |
| 71 } | |
| 72 return false; | |
| 73 }) | |
| 74 ).then(() => | |
| 75 { | |
| 76 // Navigate to the qunit index | |
| 77 driver.executeScript("location.href = \"qunit/index.html\";"); | |
|
hub
2018/08/23 12:54:00
you could go `() => driver.executeScript(...)` (dr
tlucas
2018/08/23 13:42:14
Done.
| |
| 78 }).then(() => | |
| 79 { | |
| 80 // Wait for qunit-results to be present | |
| 81 driver.wait(until.elementLocated(By.id("qunit-testresult"))); | |
|
hub
2018/08/23 12:53:59
here too.
tlucas
2018/08/23 13:42:15
Done.
| |
| 82 }).then(() => | |
| 83 { | |
| 84 // Wait for tests to finish | |
| 85 driver.wait(() => | |
|
hub
2018/08/23 12:53:59
and here
tlucas
2018/08/23 13:42:14
Done.
| |
| 86 driver.findElement(By.id("qunit-testresult")) | |
| 87 .getAttribute("innerHTML").then(data => | |
| 88 data.search("Tests completed") >= 0)); | |
| 89 }).then(() => | |
| 90 { | |
| 91 // Find passed tests | |
| 92 driver.findElements(By.css("#qunit-tests .pass .test-name")) | |
| 93 .then(elements => | |
| 94 { | |
| 95 for (let elem of elements) | |
| 96 { | |
| 97 elem.getAttribute("innerHTML").then(data => | |
| 98 { | |
| 99 test.ok(true, data); | |
| 100 }); | |
| 101 } | |
| 102 }); | |
| 103 // Find failed tests | |
| 104 driver.findElements(By.css("#qunit-tests .fail .test-name")) | |
| 105 .then(elements => | |
| 106 { | |
| 107 for (let elem of elements) | |
| 108 { | |
| 109 elem.getAttribute("innerHTML").then(data => | |
| 110 { | |
| 111 test.ok(false, "Undefined error in " + data); | |
|
hub
2018/08/23 12:54:00
And a template string here too.
tlucas
2018/08/23 13:42:15
Done.
| |
| 112 }); | |
| 113 } | |
| 114 }); | |
| 115 }).then(() => | |
| 116 { | |
| 117 driver.quit(); | |
| 118 test.done(); | |
| 119 }); | |
| 120 }); | |
| 121 }; | |
| OLD | NEW |