Skip to content

Commit 156a929

Browse files
authored
Merge pull request #33 from nagpalkaran95/selenium-4
Selenium 4 to master
2 parents 82bc4db + 1c59a31 commit 156a929

File tree

6 files changed

+51
-33
lines changed

6 files changed

+51
-33
lines changed

conf/local.conf.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,19 @@ exports.config = {
33
key: 'BROWSERSTACK_ACCESS_KEY',
44
server: 'hub-cloud.browserstack.com',
55

6-
capabilities: [{
7-
browserName: 'chrome',
8-
name: "local_test",
9-
build: "cucumber-js-browserstack",
10-
'browserstack.local': true
11-
}]
6+
capabilities: [
7+
{
8+
'browserName': 'Chrome',
9+
'browserstack.use_w3c': true,
10+
'bstack:options': {
11+
'os': 'Windows',
12+
'osVersion': '7',
13+
'sessionName': 'local_test',
14+
'buildName': 'cucumber-js-browserstack',
15+
'projectName': 'Test App',
16+
'debug': true,
17+
'local': true
18+
},
19+
}
20+
]
1221
}

conf/parallel.conf.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,28 @@ exports.config = {
22
user: 'BROWSERSTACK_USERNAME',
33
key: 'BROWSERSTACK_ACCESS_KEY',
44
server: 'hub-cloud.browserstack.com',
5-
65
commonCapabilities: {
7-
name: "parallel_test",
8-
build: "cucumber-js-browserstack"
6+
'browserstack.use_w3c': true,
7+
'bstack:options': {
8+
'sessionName': 'parallel_test',
9+
'buildName': 'cucumber-js-browserstack',
10+
'projectName': 'Test App',
11+
'debug': true,
12+
},
913
},
1014

1115
capabilities: [{
1216
browserName: 'chrome'
1317
},{
1418
browserName: 'firefox'
1519
},{
16-
browserName: 'safari',
17-
browserVersion: '12'
20+
browserName: 'internet explorer'
1821
},{
19-
browserName: 'internet explorer',
20-
browserVersion: '11'
21-
}]
22+
browserName: 'safari'
23+
}],
2224
}
2325

2426
// Code to support common capabilities
2527
exports.config.capabilities.forEach(function(caps){
26-
for(var i in exports.config.commonCapabilities) caps[i] = caps[i] || exports.config.commonCapabilities[i];
28+
Object.assign(caps, exports.config.commonCapabilities);
2729
});

conf/single.conf.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,18 @@ exports.config = {
33
key: 'BROWSERSTACK_ACCESS_KEY',
44
server: 'hub-cloud.browserstack.com',
55

6-
capabilities: [{
7-
browserName: 'chrome',
8-
name: "single_test",
9-
build: "cucumber-js-browserstack"
10-
}]
6+
capabilities: [
7+
{
8+
'browserName': 'Chrome',
9+
'browserstack.use_w3c': true,
10+
'bstack:options': {
11+
'os': 'Windows',
12+
'osVersion': '7',
13+
'sessionName': 'single_test',
14+
'buildName': 'cucumber-js-browserstack',
15+
'projectName': 'Test App',
16+
'debug': true,
17+
},
18+
}
19+
]
1120
}

features/support/hooks.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ var config = require(config_file).config;
99
var username = process.env.BROWSERSTACK_USERNAME || config.user;
1010
var accessKey = process.env.BROWSERSTACK_ACCESS_KEY || config.key;
1111

12-
var createBrowserStackSession = function(config, caps){
12+
var createBrowserStackSession = function (config, caps) {
1313
return new webdriver.Builder().
14-
usingServer('http://'+config.server+'/wd/hub').
14+
usingServer(`https://${username}:${accessKey}@${config.server}/wd/hub`).
1515
withCapabilities(caps).
1616
build();
1717
}
@@ -23,13 +23,11 @@ var myHooks = function () {
2323
var world = this;
2424
var task_id = parseInt(process.env.TASK_ID || 0);
2525
var caps = config.capabilities[task_id];
26-
caps['browserstack.user'] = username;
27-
caps['browserstack.key'] = accessKey;
2826

29-
if(caps["browserstack.local"]){
27+
if (caps["bstack:options"] && caps["bstack:options"]['local']) {
3028
// Code to start browserstack local before start of test and stop browserstack local after end of test
3129
bs_local = new browserstack.Local();
32-
bs_local.start({'key': accessKey }, function(error) {
30+
bs_local.start({ key: accessKey }, function (error) {
3331
if (error) return console.log(error.red);
3432

3533
world.driver = createBrowserStackSession(config, caps);
@@ -42,9 +40,9 @@ var myHooks = function () {
4240
}
4341
});
4442

45-
this.After(function(scenario, callback){
46-
this.driver.quit().then(function(){
47-
if(bs_local){
43+
this.After(function (scenario, callback) {
44+
this.driver.quit().then(function () {
45+
if (bs_local) {
4846
bs_local.stop(callback);
4947
}
5048
else callback();

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"devDependencies": {
1717
"cucumber": "1.3.3",
1818
"cucumber-assert": "1.0.4",
19-
"selenium-webdriver": "^3.6.0"
19+
"selenium-webdriver": "^4.0.0-alpha.1"
2020
},
2121
"dependencies": {
2222
"browserstack-local": "^1.0.0",

0 commit comments

Comments
 (0)