Left: | ||
Right: |
LEFT | RIGHT |
---|---|
1 /* | 1 /* |
geo
2018/11/08 22:13:34
This is a new file.
| |
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 edge = require("selenium-webdriver/edge"); | 20 const edge = require("selenium-webdriver/edge"); |
21 | |
22 const {executeScript} = require("./webdriver"); | 21 const {executeScript} = require("./webdriver"); |
23 | 22 |
24 function runScript(script, scriptName, scriptArgs) | 23 function runScript(script, scriptName, scriptArgs) |
25 { | 24 { |
26 let service = new edge.ServiceBuilder() | 25 let service = new edge.ServiceBuilder() |
26 // Due to some incompatibilities between selenium-webdriver 3.6 | |
27 // and Microsoft Edge webdriver we have to use the JSON wire protocol. | |
28 // However once we update to selenium-webdriver 4.0 we should remove this line . | |
27 .addArguments("--jwp") | 29 .addArguments("--jwp") |
Sebastian Noack
2018/11/09 19:13:43
Mind adding a comment why that is necessary, and t
geo
2018/11/09 19:45:09
Done.
| |
28 .build(); | 30 .build(); |
29 let options = new edge.Options(); | 31 let options = new edge.Options(); |
30 | 32 |
31 let driver = edge.Driver.createSession(options, service); | 33 let driver = edge.Driver.createSession(options, service); |
32 | 34 |
33 return executeScript(driver, "Microsoft Edge (WebDriver)", | 35 return executeScript(driver, "Microsoft Edge (WebDriver)", |
34 script, scriptName, scriptArgs); | 36 script, scriptName, scriptArgs); |
35 } | 37 } |
36 | 38 |
37 module.exports = function(script, scriptName, ...scriptArgs) | 39 module.exports = function(script, scriptName, ...scriptArgs) |
38 { | 40 { |
39 return runScript(script, scriptName, scriptArgs) | 41 return runScript(script, scriptName, scriptArgs); |
40 .then(result => result) | |
41 .catch(error => | |
42 { | |
43 throw error; | |
44 }); | |
Sebastian Noack
2018/11/09 19:13:43
What is the purpose of the then() and catch() call
geo
2018/11/09 19:45:09
Done.
| |
45 }; | 42 }; |
LEFT | RIGHT |