Refactoring

Author: hariharanbrowserstack

bin/helpers/capabilityHelper.js

@@ -239,9 +239,11 @@ const validate = (bsConfig, args) => {
         // Detect if the user is not using the right directory structure, and throw an error
         if (!Utils.isUndefined(cypressConfigFile.integrationFolder) && !Utils.isCypressProjDirValid(bsConfig.run_settings.cypressProjectDir,cypressConfigFile.integrationFolder)) reject(Constants.validationMessages.INCORRECT_DIRECTORY_STRUCTURE);
       }
-      logger.debug("Validating baseurl and integrationFolder in browserstack.json");
-      if (!Utils.isUndefinedOrFalse(bsConfig.run_settings.enforce_settings) &&  !Utils.isUndefined(bsConfig.run_settings.baseUrl) && bsConfig.run_settings.baseUrl.includes("localhost") && !Utils.getLocalFlag(bsConfig.connection_settings)) reject(Constants.validationMessages.LOCAL_NOT_SET.replace("<baseUrlValue>", bsConfig.run_settings.baseUrl));
-      if (!Utils.isUndefinedOrFalse(bsConfig.run_settings.enforce_settings) &&  !Utils.isUndefined(bsConfig.run_settings.integrationFolder) && !Utils.isCypressProjDirValid(bsConfig.run_settings.cypressProjectDir,bsConfig.run_settings.integrationFolder)) reject(Constants.validationMessages.INCORRECT_DIRECTORY_STRUCTURE);
+      else {
+        logger.debug("Validating baseurl and integrationFolder in browserstack.json");
+        if (!Utils.isUndefined(bsConfig.run_settings.baseUrl) && bsConfig.run_settings.baseUrl.includes("localhost") && !Utils.getLocalFlag(bsConfig.connection_settings)) reject(Constants.validationMessages.LOCAL_NOT_SET.replace("<baseUrlValue>", bsConfig.run_settings.baseUrl));
+        if (!Utils.isUndefined(bsConfig.run_settings.integrationFolder) && !Utils.isCypressProjDirValid(bsConfig.run_settings.cypressProjectDir,bsConfig.run_settings.integrationFolder)) reject(Constants.validationMessages.INCORRECT_DIRECTORY_STRUCTURE);
+      }
     } catch(error){
       reject(Constants.validationMessages.INVALID_CYPRESS_JSON)
     }

bin/helpers/constants.js

@@ -70,8 +70,6 @@ const userMessages = {
   UPLOADING_TESTS_SUCCESS: "Uploaded tests successfully",
   UPLOADING_NPM_PACKAGES: "Uploading required node_modules to BrowserStack",
   UPLOADING_NPM_PACKAGES_SUCCESS: "Uploaded node_modules successfully",
-  SKIP_CYPRESSCONFIG_INSTALL:
-    "Skipping Cypress Config Install as the enforce_settings has been passed.",
   SKIP_UPLOADING_TESTS:
     "Skipping zip upload since BrowserStack already has your test suite that has not changed since the last run.",
   SKIP_NPM_INSTALL:

bin/helpers/utils.js

@@ -1292,29 +1292,28 @@ exports.setConfig = (bsConfig, args) => {
 
 // set configs if enforce_settings is passed
 exports.setEnforceSettingsConfig = (bsConfig) => {
-  let config_args = (!this.isUndefined(bsConfig) && !this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.config)) ? bsConfig.run_settings.config : undefined;
+  if ( this.isUndefined(bsConfig) || this.isUndefined(bsConfig.run_settings) ) return;
+  let config_args = (bsConfig && bsConfig.run_settings && bsConfig.run_settings.config) ? bsConfig.run_settings.config : undefined;
   if ( this.isUndefined(config_args) || !config_args.includes("video") ) {
     let video_args = (this.isUndefined(bsConfig.run_settings.video_config) || this.isUndefined(bsConfig.run_settings.video_config.video) || !bsConfig.run_settings.video_config.video ) ? 'video=false' : 'video=true' ;
     video_args += (this.isUndefined(bsConfig.run_settings.video_config) || this.isUndefined(bsConfig.run_settings.video_config.videoUploadOnPasses) || !bsConfig.run_settings.video_config.videoUploadOnPasses ) ? ',videoUploadOnPasses=false' : ',videoUploadOnPasses=true';
     config_args = this.isUndefined(config_args) ? video_args : config_args + ',' + video_args;
     logger.debug(`Setting video_args for enforce_settings to ${video_args}`);
   }
-  if ( (!this.isUndefined(bsConfig) && !this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.baseUrl)) && (this.isUndefined(config_args) || !config_args.includes("baseUrl")) ) {
+  if ( (bsConfig && bsConfig.run_settings && bsConfig.run_settings.baseUrl) && (this.isUndefined(config_args) || !config_args.includes("baseUrl")) ) {
     let base_url_args = 'baseUrl='+bsConfig.run_settings.baseUrl;
     config_args = this.isUndefined(config_args) ? base_url_args : config_args + ',' + base_url_args;
     logger.debug(`Setting base_url_args for enforce_settings to ${base_url_args}`);
   }
   // set specs in config of specpattern to override cypress config
-  if(!this.isUndefined(bsConfig) && !this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.specs)) {
+  if( this.isNotUndefined(bsConfig.run_settings.specs) && bsConfig.run_settings.cypressTestSuiteType === Constants.CYPRESS_V10_AND_ABOVE_TYPE ) {
+    // doing this only for cypress 10 and above as --spec is given precedence for cypress 9.
     let spec_pattern_args = 'specPattern="'+bsConfig.run_settings.specs+'"';
-    if( bsConfig.run_settings.cypressTestSuiteType !== Constants.CYPRESS_V10_AND_ABOVE_TYPE) {
-      spec_pattern_args = 'testFiles="'+bsConfig.run_settings.specs+'"';
-    }
     config_args = this.isUndefined(config_args) ? spec_pattern_args : config_args + ',' + spec_pattern_args;
   }
-  if ( !this.isUndefined(config_args) ) bsConfig["run_settings"]["config"] = config_args;
+  if ( this.isNotUndefined(config_args) ) bsConfig["run_settings"]["config"] = config_args;
   logger.debug(`Setting conifg_args for enforce_settings to ${config_args}`);
-}  
+}
 
 // blindly send other passed configs with run_settings and handle at backend
 exports.setOtherConfigs = (bsConfig, args) => {