Change env in run_settings from string to object

browserstack · Jul 20, 2021 · 1e0fa8e · 1e0fa8e
1 parent 373325f
commit 1e0fa8e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/bin/helpers/utils.js b/bin/helpers/utils.js
@@ -269,13 +269,8 @@ exports.setUserSpecs = (bsConfig, args) => {
 exports.setTestEnvs = (bsConfig, args) => {
   let envKeys = {};
 
-  // set env vars which are defined in env key as a string
-  if(!this.isUndefined(bsConfig.run_settings.env)) {
-    let bstackJsonEnvVars = this.fixCommaSeparatedString(bsConfig.run_settings.env).split(',');
-    bstackJsonEnvVars.forEach((envVar) => {
-      let env = envVar.split("=");
-      envKeys[env[0]] = env[1];
-    });
+  if(bsConfig.run_settings.env && Object.keys(bsConfig.run_settings.env).length !== 0) {
+    envKeys = bsConfig.run_settings.env;
   }
 
   // set env vars which are defined in system_env_vars key

diff --git a/test/unit/bin/helpers/utils.js b/test/unit/bin/helpers/utils.js
@@ -525,7 +525,10 @@ describe('utils', () => {
     it('set env only from browserstack.json env param', () => {
       let bsConfig = {
         run_settings: {
-          env: 'env1=value1, env2=value2',
+          env: {
+            env1: 'value1',
+            env2: 'value2',
+          }
         },
       };
       let args = {
@@ -540,7 +543,10 @@ describe('utils', () => {
       let argsEnv = 'env3=value3, env4=value4';
       let bsConfig = {
         run_settings: {
-          env: 'env1=value1, env2=value2',
+          env: {
+            env1: 'value1',
+            env2: 'value2',
+          }
         },
       };
       let args = {
@@ -555,7 +561,10 @@ describe('utils', () => {
       let argsEnv = 'env1=value0, env4=value4';
       let bsConfig = {
         run_settings: {
-          env: 'env1=value1, env2=value2',
+          env: {
+            env1: 'value1',
+            env2: 'value2',
+          }
         },
       };
       let args = {
@@ -570,7 +579,10 @@ describe('utils', () => {
       let argsEnv = 'env3=value3 , env4=value4';
       let bsConfig = {
         run_settings: {
-          env: 'env1=value1 , env2=value2',
+          env: {
+            env1: 'value1',
+            env2: 'value2',
+          }
         },
       };
       let args = {
@@ -587,7 +599,10 @@ describe('utils', () => {
       let argsEnv = 'env3=value3 , env4=value4';
       let bsConfig = {
         run_settings: {
-          env: 'env1=value1 , env2=value2',
+          env: {
+            env1: 'value1',
+            env2: 'value2',
+          },
           system_env_vars: ['ENV1', 'ENV2']
         },
       };
@@ -625,7 +640,10 @@ describe('utils', () => {
       let argsEnv = 'env3=value3 , env4=value4';
       let bsConfig = {
         run_settings: {
-          env: 'env1=value1 , env2=value2'
+          env: {
+            env1: 'value1',
+            env2: 'value2',
+          }
         },
       };
       let args = {