Skip to content

Commit 4ea5908

Browse files
committed
Merge branch 'develop' of https://github.com/Breeding-Insight/taf into develop
* 'develop' of https://github.com/Breeding-Insight/taf: Setup to use webdriver.
2 parents 8dd8ac5 + 4dbfa2b commit 4ea5908

File tree

2 files changed

+16
-26
lines changed

2 files changed

+16
-26
lines changed

nightwatch.conf.js

+14-23
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,22 @@
33
module.exports = {
44
globals_path: "globals.js",
55
page_objects_path: "./src/page_objects", //page_objects folder where selectors are saved
6-
selenium: {
7-
start_process: true,
8-
port: 4444,
9-
start_session: true,
10-
server_path: require("selenium-server").path,
11-
12-
cli_args: {
13-
"webdriver.gecko.driver": require("geckodriver").path,
14-
"webdriver.chrome.driver": require("chromedriver").path,
15-
//don't use the 64bit driver. it is really slow
16-
"webdriver.edge.driver": "./src/driver/msedgedriver.exe",
17-
"webdriver.ie.driver":
18-
"./node_modules/iedriver/lib/iedriver/IEDriverServer.exe",
19-
},
20-
},
21-
226
test_settings: {
237
default: {
8+
webdriver: {
9+
start_process: true,
10+
server_path: require("chromedriver").path,
11+
port: 4444,
12+
cli_args: ['--port=4444']
13+
},
14+
desiredCapabilities: {
15+
browserName: "chrome",
16+
javascriptEnabled: true,
17+
acceptSslCerts: true,
18+
chromeOptions: {
19+
args: ['headless', 'no-sandbox', 'disable-gpu']
20+
}
21+
},
2422
launch_url: "http://localhost",
2523
screenshots: {
2624
enabled: true,
@@ -46,13 +44,6 @@ module.exports = {
4644
},
4745
},
4846
chrome: {
49-
desiredCapabilities: {
50-
browserName: "chrome",
51-
chromeOptions: {
52-
args: ["headless", "no-sandbox", "disable-gpu"],
53-
w3c: false,
54-
},
55-
},
5647
},
5748
edge: {
5849
selenium: {

package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
"geckodriver": "^3.2.0",
3838
"iedriver": "^3.14.2",
3939
"mkdirp": "^1.0.4",
40-
"nightwatch": "^1.6.3",
41-
"nightwatch-api": "^3.0.1",
42-
"selenium-server": "^3.141.59"
40+
"nightwatch": "^1.7.13",
41+
"nightwatch-api": "^3.0.1"
4342
}
4443
}

0 commit comments

Comments
 (0)