Setting local & local_identifier if not present in conf json but set as env variable.

Author: karanshah-browserstack

bin/helpers/utils.js

@@ -173,7 +173,7 @@ exports.getLocalFlag = (connectionSettings) => {
 }
 
 exports.setLocal = (bsConfig) => {
-  if(!this.isUndefined(process.env.BROWSERSTACK_LOCAL) && !this.isUndefined(bsConfig.connection_settings)){
+  if(!this.isUndefined(process.env.BROWSERSTACK_LOCAL)){
     let local = false;
     if(String(process.env.BROWSERSTACK_LOCAL).toLowerCase() === "true") local = true;
     bsConfig['connection_settings']['local'] = local;
@@ -182,7 +182,7 @@ exports.setLocal = (bsConfig) => {
 }
 
 exports.setLocalIdentifier = (bsConfig) => {
-  if (!this.isUndefined(process.env.BROWSERSTACK_LOCAL_IDENTIFIER) && !this.isUndefined(bsConfig.connection_settings)){
+  if (!this.isUndefined(process.env.BROWSERSTACK_LOCAL_IDENTIFIER)){
     bsConfig['connection_settings']['local_identifier'] = process.env.BROWSERSTACK_LOCAL_IDENTIFIER;
     logger.info("Reading local identifier from the environment variable BROWSERSTACK_LOCAL_IDENTIFIER");
   }

test/unit/bin/helpers/utils.js

@@ -344,6 +344,17 @@ describe("utils", () => {
       utils.setLocal(bsConfig);
       expect(bsConfig.connection_settings.local).to.be.eq(true);
     });
+
+    it("should set local to true in bsConfig if process.env.BROWSERSTACK_LOCAL is set to true & local is not set in bsConfig", () => {
+      let bsConfig = {
+        connection_settings: {
+        }
+      }
+      process.env.BROWSERSTACK_LOCAL = true;
+      utils.setLocal(bsConfig);
+      expect(bsConfig.connection_settings.local).to.be.eq(true);
+    });
+
   });
 
   describe("setLocalIdentifier", () => {
@@ -375,6 +386,16 @@ describe("utils", () => {
       expect(bsConfig.connection_settings.local_identifier).to.be.eq("local_identifier");
     });
 
+    it("should set local identifier in connection_settings in bsConfig if process.env.BROWSERSTACK_LOCAL_IDENTIFIER is present & not set in bsConfig", () => {
+      let bsConfig = {
+        connection_settings: {
+        }
+      }
+      process.env.BROWSERSTACK_LOCAL_IDENTIFIER = "local_identifier";
+      utils.setLocalIdentifier(bsConfig);
+      expect(bsConfig.connection_settings.local_identifier).to.be.eq("local_identifier");
+    });
+
   });
 
   describe("setUsername", () => {