Merge pull request #48 from Ankit098/v7

make v7 wdio as master

Author: francisf

conf/base.conf.js

@@ -6,13 +6,6 @@ exports.config = {
   specs: ['./tests/specs/test.js'],
   exclude: [],
 
-  capabilities: [
-    {
-      browserName: 'Chrome',
-      build: 'browserstack-build-1',
-    },
-  ],
-
   logLevel: 'warn',
   coloredLogs: true,
   screenshotPath: './errorShots/',
@@ -21,7 +14,7 @@ exports.config = {
   connectionRetryTimeout: 90000,
   connectionRetryCount: 3,
   hostname: 'hub.browserstack.com',
-  services: [['@wdio/browserstack-service']],
+  services: [['browserstack']],
 
   before: function () {
     var chai = require('chai');

conf/local-test.conf.js

@@ -4,14 +4,17 @@ const localConfig = {
   // Adding browserstackLocal to browserstack-service to initiate local binary
   services: [
     [
-      '@wdio/browserstack-service',
+      'browserstack',
       { browserstackLocal: true, opts: { forcelocal: false } },
     ],
   ],
   capabilities: [
     {
       browserName: 'chrome',
-      build: 'browserstack-build-1',
+      browserVersion: 'latest',
+      'bstack:options': {
+        buildName: 'browserstack-build-1',
+      }
     },
   ],
   specs: ['./tests/specs/local_test.js'],

conf/test.conf.js

@@ -1,29 +1,42 @@
-const { config: baseConfig } = require("./base.conf.js");
+const { config: baseConfig } = require('./base.conf.js');
 
 const parallelConfig = {
   maxInstances: 10,
   commonCapabilities: {
-    build: 'browserstack-build-1',
+    'bstack:options': {
+      buildName: 'browserstack-build-1',
+    }
   },
-  capabilities: [{
-    browserName: 'chrome',
-    browserVersion: 'latest',
-    os: 'Windows',
-    osVersion: '10'
-  }, {
-    browserName: 'safari',
-    browserVersion: 'latest',
-    os: 'OS X',
-    osVersion: 'Big Sur'
-  }, {
-    browserName: 'chrome',
-    device: 'Samsung Galaxy S20'
-  }],
+  capabilities: [
+    {
+      browserName: 'chrome',
+      browserVersion: 'latest',
+      'bstack:options': {
+        os: 'Windows',
+        osVersion: '10',
+      },
+    },
+    {
+      browserName: 'safari',
+      browserVersion: 'latest',
+      'bstack:options': {
+        os: 'OS X',
+        osVersion: 'Big Sur',
+      },
+    },
+    {
+      browserName: 'chrome',
+      'bstack:options': {
+        deviceName: 'Samsung Galaxy S20',
+      },
+    },
+  ],
 };
 
 exports.config = { ...baseConfig, ...parallelConfig };
 
 // Code to support common capabilities
 exports.config.capabilities.forEach(function (caps) {
-  for (var i in exports.config.commonCapabilities) caps[i] = caps[i] || exports.config.commonCapabilities[i];
+  for (var i in exports.config.commonCapabilities)
+    caps[i] = { ...caps[i], ...exports.config.commonCapabilities[i]};
 });