Handle messaging changes

Author: Karan Nagpal

bin/helpers/capabilityHelper.js

@@ -73,11 +73,11 @@ const caps = (bsConfig, zip) => {
 
     // binary was spawned locally
     if(obj.local === true) {
-      if (!Utils.isUndefined(process.env.BSTACK_CYPRESS_RUN_LOCAL_BINARY) && process.env.BSTACK_CYPRESS_RUN_LOCAL_BINARY == "true") {
+      if (!Utils.isUndefined(process.env.BSTACK_CYPRESS_LOCAL_BINARY_RUNNING) && process.env.BSTACK_CYPRESS_LOCAL_BINARY_RUNNING == "true") {
         obj.localMode = null;
 
         // Local Mode
-        if (obj.local === true && bsConfig.connection_settings.local_mode) {
+        if (bsConfig.connection_settings.local_mode) {
           obj.localMode = bsConfig.connection_settings.local_mode;
           if (bsConfig.connection_settings.user_defined_local_mode_warning) {
             logger.warn(Constants.userMessages.INVALID_LOCAL_MODE_WARNING);
@@ -87,15 +87,17 @@ const caps = (bsConfig, zip) => {
 
         // Local Identifier
         obj.localIdentifier = null;
-        if (obj.local === true && (bsConfig.connection_settings.localIdentifier || bsConfig.connection_settings.local_identifier)) {
+        if (bsConfig.connection_settings.localIdentifier || bsConfig.connection_settings.local_identifier) {
           obj.localIdentifier = bsConfig.connection_settings.localIdentifier || bsConfig.connection_settings.local_identifier;
           logger.info(`Local testing identifier: ${obj.localIdentifier}`);
         }
-      } else {
-        logger.info(Constants.userMessages.LOCAL_BINARY_ALREADY_RUNNING);
       }
     }
 
+    if (!Utils.isUndefined(process.env.BSTACK_CYPRESS_LOCAL_BINARY_ALREADY_RUNNING) && process.env.BSTACK_CYPRESS_LOCAL_BINARY_ALREADY_RUNNING == "true") {
+      logger.info(Constants.userMessages.LOCAL_BINARY_ALREADY_RUNNING);
+    }
+
     logger.info(`Local is set to: ${obj.local} (${obj.local ? Constants.userMessages.LOCAL_TRUE : Constants.userMessages.LOCAL_FALSE})`);
 
     // Project name

bin/helpers/utils.js

@@ -641,7 +641,8 @@ exports.setupLocalTesting = (bsConfig, args, rawArgs) => {
         }
       } else {
         localIdentifierRunning = true;
-        process.env.BSTACK_CYPRESS_RUN_LOCAL_BINARY = "true";
+        process.env.BSTACK_CYPRESS_LOCAL_BINARY_ALREADY_RUNNING = "true"; // shows message when binary is not spawned by the CLI process
+        process.env.BSTACK_CYPRESS_LOCAL_BINARY_RUNNING = "true";
       }
       if (!localIdentifierRunning){
         bsConfig.connection_settings.usedAutoLocal = true;
@@ -651,6 +652,7 @@ exports.setupLocalTesting = (bsConfig, args, rawArgs) => {
         logger.info('Setting up Local testing...');
         bs_local.start(bs_local_args, function (localStartError) {
           if (that.isUndefined(localStartError)) {
+            process.env.BSTACK_CYPRESS_LOCAL_BINARY_RUNNING = "true";
             resolve(bs_local);
           } else {
             let message = `name: ${localStartError.name}, message: ${localStartError.message}, extra: ${localStartError.extra}`,