Merge pull request #18 from nagpalkaran95/selenium-4

Selenium 4 to master

Author: francisf

.gitignore

@@ -1 +1,6 @@
+node_modules/
+**/.DS_Store
 local.log
+
+.vscode/
+.env

conf/local.conf.js

@@ -1,10 +1,11 @@
 exports.capabilities = {
-  'browserstack.user': process.env.BROWSERSTACK_USERNAME || 'BROWSERSTACK_USERNAME',
-  'browserstack.key': process.env.BROWSERSTACK_ACCESS_KEY || 'BROWSERSTACK_ACCESS_KEY',
-  'build': 'mocha-browserstack',
-  'name': 'local_test',
-  'browserstack.debug': 'true',
-
   'browserName': 'chrome',
-  'browserstack.local': true
+  'bstack:options': {
+	'userName': process.env.BROWSERSTACK_USERNAME || 'BROWSERSTACK_USERNAME',
+	'accessKey': process.env.BROWSERSTACK_ACCESS_KEY || 'BROWSERSTACK_ACCESS_KEY',
+	'buildName': 'mocha-browserstack',
+	'sessionName': 'local_test',
+	'debug': 'true',
+    'local': true
+  }
 };

conf/parallel.conf.js

@@ -1,48 +1,61 @@
 var config = {
   'commonCapabilities': {
-    'browserstack.user': process.env.BROWSERSTACK_USERNAME || 'BROWSERSTACK_USERNAME',
-    'browserstack.key': process.env.BROWSERSTACK_ACCESS_KEY || 'BROWSERSTACK_ACCESS_KEY',
-    'build': 'mocha-browserstack',
-    'browserstack.debug': 'true',
+    'userName': process.env.BROWSERSTACK_USERNAME || 'BROWSERSTACK_USERNAME',
+    'accessKey': process.env.BROWSERSTACK_ACCESS_KEY || 'BROWSERSTACK_ACCESS_KEY',
+    'buildName': 'mocha-browserstack',
+    'debug': 'true',
   },
   'multiCapabilities': [{
-      'os': 'Windows',
-      'os_version': '10',
       'browserName': 'Chrome',
-      'browser_version': 'latest',
-      'name': 'Parallel test 1'
+      'browserVersion': 'latest',
+      'bstack:options': {
+        'os': 'Windows',
+        'osVersion': '10',
+        'sessionName': 'Parallel test 1'
+      }
     },
     {
-      'os': 'OS X',
-      'os_version': 'Monterey',
       'browserName': 'Chrome',
-      'browser_version': 'latest',
-      'name': 'Parallel test 2'
+      'browserVersion': 'latest',
+      'bstack:options': {
+        'os': 'OS X',
+        'osVersion': 'Monterey',
+        'sessionName': 'Parallel test 2'
+      }
     },
     {
-      'os' : 'OS X',
-      'os_version' : 'Big Sur',
       'browserName' : 'Safari',
-      'name': 'Parallel test 3'
+      'bstack:options': {
+        'os' : 'OS X',
+        'osVersion' : 'Big Sur',
+        'sessionName': 'Parallel test 3'
+      }
     },
     {
       'browserName': 'Android',
-      'device': 'Samsung Galaxy S20',
-      'realMobile': 'true',
-      'name': 'Parallel test 4'
+      'bstack:options': {
+        'deviceName': 'Samsung Galaxy S20',
+        'realMobile': 'true',
+        'sessionName': 'Parallel test 4'
+      }
     },
     {
       'browserName': 'iPhone',
-      'device': 'iPhone 12 Pro Max',
-      'realMobile': 'true',
-      'name': 'Parallel test 5'
+      'bstack:options': {
+        'deviceName': 'iPhone 12 Pro Max',
+        'realMobile': 'true',
+        'sessionName': 'Parallel test 5'
+      }
   }]
 };
 
 exports.capabilities = [];
 // Code to support common capabilities
 config.multiCapabilities.forEach(function(caps) {
   var temp_caps = JSON.parse(JSON.stringify(config.commonCapabilities));
-  for(var i in caps) temp_caps[i] = caps[i];
-  exports.capabilities.push(temp_caps);
+  caps['bstack:options'] = {
+    ...caps['bstack:options'],
+    ...temp_caps
+  };
+  exports.capabilities.push(caps);
 });

conf/single.conf.js

@@ -1,9 +1,10 @@
 exports.capabilities = {
-  'browserstack.user': process.env.BROWSERSTACK_USERNAME || 'BROWSERSTACK_USERNAME',
-  'browserstack.key': process.env.BROWSERSTACK_ACCESS_KEY || 'BROWSERSTACK_ACCESS_KEY',
-  'build': 'mocha-browserstack',
-  'name': 'single_test',
-  'browserstack.debug': 'true',
-
-  'browserName': 'chrome'
+  'browserName': 'chrome',
+  'bstack:options': {
+	'userName': process.env.BROWSERSTACK_USERNAME || 'BROWSERSTACK_USERNAME',
+	'accessKey': process.env.BROWSERSTACK_ACCESS_KEY || 'BROWSERSTACK_ACCESS_KEY',
+	'buildName': 'mocha-browserstack',
+	'sessionName': 'single_test',
+	'debug': 'true',
+  }
 };