Skip to content

Commit bbb6581

Browse files
Ankit098francisf
authored andcommitted
add: updated webdriverIO and service versions
1 parent 8ef7fa1 commit bbb6581

5 files changed

Lines changed: 2381 additions & 4299 deletions

File tree

conf/base.conf.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ exports.config = {
88
],
99
exclude: [],
1010

11-
capabilities: [{
12-
browserName: 'Chrome',
13-
build: 'browserstack-build-1',
14-
}],
15-
1611
logLevel: 'warn',
1712
coloredLogs: true,
1813
screenshotPath: './errorShots/',
@@ -21,7 +16,7 @@ exports.config = {
2116
connectionRetryTimeout: 90000,
2217
connectionRetryCount: 3,
2318
hostname: 'hub.browserstack.com',
24-
services: [['@browserstack/wdio-browserstack-service']],
19+
services: [['@wdio/browserstack-service']],
2520

2621
before: function () {
2722
var chai = require('chai');

conf/local-test.conf.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
1-
const { config: baseConfig } = require("./base.conf.js");
1+
const { config: baseConfig } = require('./base.conf.js');
22

33
const localConfig = {
44
// Adding browserstackLocal to browserstack-service to initiate local binary
5-
services: [['@browserstack/wdio-browserstack-service', { browserstackLocal: true, forcelocal: false }]],
6-
capabilities: [{
7-
browserName: 'chrome',
8-
build: 'browserstack-build-1'
9-
}],
10-
specs: ['./tests/specs/local_test.js']
5+
services: [
6+
[
7+
'@wdio/browserstack-service',
8+
{ browserstackLocal: true, opts: { forcelocal: false } },
9+
],
10+
],
11+
capabilities: [
12+
{
13+
browserName: 'chrome',
14+
browserVersion: 'latest',
15+
'bstack:options': {
16+
buildName: 'browserstack-build-1',
17+
}
18+
},
19+
],
20+
specs: ['./tests/specs/local_test.js'],
1121
};
1222

1323
exports.config = { ...baseConfig, ...localConfig };

conf/test.conf.js

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,42 @@
1-
const { config: baseConfig } = require("./base.conf.js");
1+
const { config: baseConfig } = require('./base.conf.js');
22

33
const parallelConfig = {
44
maxInstances: 10,
55
commonCapabilities: {
6-
build: 'browserstack-build-1',
6+
'bstack:options': {
7+
buildName: 'browserstack-build-1',
8+
}
79
},
8-
capabilities: [{
9-
browserName: 'chrome',
10-
browserVersion: 'latest',
11-
os: 'Windows',
12-
osVersion: '10'
13-
}, {
14-
browserName: 'safari',
15-
browserVersion: 'latest',
16-
os: 'OS X',
17-
osVersion: 'Big Sur'
18-
}, {
19-
browserName: 'chrome',
20-
device: 'Samsung Galaxy S20'
21-
}],
10+
capabilities: [
11+
{
12+
browserName: 'chrome',
13+
browserVersion: 'latest',
14+
'bstack:options': {
15+
os: 'Windows',
16+
osVersion: '10',
17+
},
18+
},
19+
{
20+
browserName: 'safari',
21+
browserVersion: 'latest',
22+
'bstack:options': {
23+
os: 'OS X',
24+
osVersion: 'Big Sur',
25+
},
26+
},
27+
{
28+
browserName: 'chrome',
29+
'bstack:options': {
30+
deviceName: 'Samsung Galaxy S20',
31+
},
32+
},
33+
],
2234
};
2335

2436
exports.config = { ...baseConfig, ...parallelConfig };
2537

2638
// Code to support common capabilities
2739
exports.config.capabilities.forEach(function (caps) {
28-
for (var i in exports.config.commonCapabilities) caps[i] = caps[i] || exports.config.commonCapabilities[i];
40+
for (var i in exports.config.commonCapabilities)
41+
caps[i] = { ...caps[i], ...exports.config.commonCapabilities[i]};
2942
});

0 commit comments

Comments
 (0)