move browserName outside bstack:options

Author: kamal-kaur04

build.gradle

@@ -5,11 +5,11 @@ plugins {
 repositories { mavenCentral() }
 
 dependencies {
-    compile 'org.testng:testng:6.9.10'
-    compile 'commons-io:commons-io:1.3.2'
-    compile 'org.seleniumhq.selenium:selenium-java:3.12.0'
-    compile 'com.browserstack:browserstack-local-java:0.1.0'
-    compile 'com.googlecode.json-simple:json-simple:1.1.1'
+    implementation 'org.testng:testng:6.9.10'
+    implementation 'commons-io:commons-io:1.3.2'
+    implementation 'org.seleniumhq.selenium:selenium-java:4.1.0'
+    implementation 'com.browserstack:browserstack-local-java:0.1.0'
+    implementation 'com.googlecode.json-simple:json-simple:1.1.1'
 }
 
 group = 'com.browserstack'

src/test/java/com/browserstack/BrowserStackTestNGTest.java

@@ -62,7 +62,7 @@ public void setUp(String config_file, String environment) throws Exception {
 
         if (capabilities.getCapability("bstack:options") != null) {
             HashMap bstackOptionsMap = (HashMap) capabilities.getCapability("bstack:options");
-            if (bstackOptionsMap.get("local").toString().equalsIgnoreCase("true")) {
+            if (bstackOptionsMap.get("local") != null && bstackOptionsMap.get("local").toString().equalsIgnoreCase("true")) {
                 l = new Local();
                 Map<String, String> options = new HashMap<String, String>();
                 options.put("key", accessKey);

src/test/resources/conf/local.conf.json

@@ -14,9 +14,7 @@
 
   "environments": {
     "chrome": {
-      "bstack:options": {
         "browserName": "chrome"
-      }
     }
   }
 }

src/test/resources/conf/parallel.conf.json

@@ -14,20 +14,16 @@
 
   "environments": {
     "env1": {
-      "bstack:options": {
         "browserName": "chrome"
-      }
     },
     "env2": {
-      "bstack:options": {
         "browserName": "firefox"
-      }
     },
     "env3": {
       "bstack:options": {
-        "os": "OS X",
-        "browserName": "safari"
-      }
+        "os": "OS X"
+      },
+      "browserName": "safari"
     }
   }
 }

src/test/resources/conf/single.conf.json

@@ -14,9 +14,7 @@
 
   "environments": {
     "chrome": {
-      "bstack:options": {
         "browserName": "chrome"
-      }
     }
   }
 }

src/test/resources/conf/suite.conf.json

@@ -13,25 +13,19 @@
 
   "environments": {
     "chrome": {
-      "bstack:options": {
         "browserName": "chrome"
-      }
     },
     "firefox": {
-      "bstack:options": {
         "browserName": "firefox"
-      }
     },
     "safari": {
       "bstack:options": {
-        "os": "OS X",
-        "browserName": "safari"
-      }
+        "os": "OS X"
+      },
+      "browserName": "safari"
     },
     "ie": {
-      "bstack:options": {
         "browserName": "internet explorer"
-      }
     }
   }
 }