Default handling video for cyp 13 similar as cyp 12

Author: hariharanbrowserstack

bin/helpers/utils.js

@@ -1297,10 +1297,9 @@ exports.setVideoCliConfig = (bsConfig, videoConfig) => {
   let cypress_major_version = (user_cypress_version && user_cypress_version.match(/^(\d+)/)) ? user_cypress_version.split(".")[0] : undefined;
   let config_args = (bsConfig && bsConfig.run_settings && bsConfig.run_settings.config) ? bsConfig.run_settings.config : undefined;
   if(this.isUndefined(user_cypress_version) || this.isUndefined(cypress_major_version) || parseInt(cypress_major_version) >= 13 ) {
-    logger.debug('Setting default video for cypress 13 and above');
     let video_args = `video=${videoConfig.video},videoUploadOnPasses=${videoConfig.videoUploadOnPasses}`;
     config_args = this.isUndefined(config_args) ? video_args : config_args + ',' + video_args;
-    logger.debug(`Setting video true in cli for cypress version ${user_cypress_version} with cli args - ${config_args}`)
+    logger.debug(`Setting default video true for cypress 13 and above in cli for cypress version ${user_cypress_version} with cli args - ${config_args}`)
   }
   if (bsConfig.run_settings && this.isNotUndefined(config_args)) bsConfig["run_settings"]["config"] = config_args;
 }
@@ -1553,13 +1552,15 @@ exports.getVideoConfig = (cypressConfig, bsConfig = {}) => {
     video: true,
     videoUploadOnPasses: true
   }
-   // Reading from bsconfig first to give precedance and cypress config will be empty in case of enforce_settings
-  if (!this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.video)) conf.video = bsConfig.run_settings.video;
-  if (!this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.videoUploadOnPasses)) conf.videoUploadOnPasses = bsConfig.run_settings.videoUploadOnPasses;
+   // Reading bsconfig in case of enforce_settings
   if ( this.isUndefined(bsConfig.run_settings) || this.isUndefinedOrFalse(bsConfig.run_settings.enforce_settings) ) {
     if (!this.isUndefined(cypressConfig.video)) conf.video = cypressConfig.video;
     if (!this.isUndefined(cypressConfig.videoUploadOnPasses)) conf.videoUploadOnPasses = cypressConfig.videoUploadOnPasses;
   }
+  else {
+    if (!this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.video)) conf.video = bsConfig.run_settings.video;
+    if (!this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.videoUploadOnPasses)) conf.videoUploadOnPasses = bsConfig.run_settings.videoUploadOnPasses;
+  }
 
   // set video in cli config in case of cypress 13 or above as default value is false there.
   this.setVideoCliConfig(bsConfig,conf);

test/unit/bin/helpers/utils.js

@@ -3517,20 +3517,20 @@ describe('utils', () => {
       expect(outputConfig).to.be.eql(bsConfig.run_settings.config);
     });
 
-    it('should add not default video config in cli config only for cyp 12 or below', () => {
+    it('should not add default video config in cli config only for cyp 12 or below', () => {
       let bsConfig = {
         run_settings: {cypress_version: '12.latest'},
       };
       utils.getVideoConfig({}, bsConfig);
       expect(undefined).to.be.eql(bsConfig.run_settings.config);
     });
 
-    it('should add bstack json video config in cli config if none in cypress config for cyp 13', () => {
+    it('should not add bstack json video config in cli config if none in cypress config for cyp 13', () => {
       let bsConfig = {
         run_settings: {cypress_version: '13.latest', video: true, videoUploadOnPasses: false}
       };
       let cypressConfig = {};
-      let outputConfig = 'video=true,videoUploadOnPasses=false';
+      let outputConfig = 'video=true,videoUploadOnPasses=true';
       utils.getVideoConfig(cypressConfig, bsConfig);
       expect(outputConfig).to.be.eql(bsConfig.run_settings.config);
     });