Merge remote-tracking branch 'origin/master' into SDK-UNKNOW

Author: AakashHotchandani

bin/commands/runs.js

@@ -222,7 +222,7 @@ module.exports = function run(args, rawArgs) {
     markBlockStart('validateConfig');
     logger.debug("Started configs validation");
     return capabilityHelper.validate(bsConfig, args).then(function (cypressConfigFile) {
-      if(process.env.BROWSERSTACK_TEST_ACCESSIBILITY) {
+      if(process.env.BROWSERSTACK_TEST_ACCESSIBILITY === 'true') {
         setAccessibilityEventListeners(bsConfig);
       }
       if(process.env.BS_TESTOPS_BUILD_COMPLETED) {

bin/helpers/utils.js

@@ -1755,15 +1755,14 @@ exports.getVideoConfig = (cypressConfig, bsConfig = {}) => {
     video: true,
     videoUploadOnPasses: true
   }
-   // 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;
-  }
+
+  // here if we have enforce_setting: true then cypressConfig will be {} as we are not reading cypress.config.js file in that case
+  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;
+  if (!this.isUndefined(cypressConfig.video)) { conf.video = cypressConfig.video;}
+  if (!this.isUndefined(cypressConfig.videoUploadOnPasses)){ conf.videoUploadOnPasses = cypressConfig.videoUploadOnPasses;}
+  if (!this.isUndefined(cypressConfig.e2e) && !this.isUndefined(cypressConfig.e2e.video)) { conf.video = cypressConfig.e2e.video;}
+  if (!this.isUndefined(cypressConfig.e2e) && !this.isUndefined(cypressConfig.e2e.videoUploadOnPasses)){ conf.videoUploadOnPasses = cypressConfig.e2e.videoUploadOnPasses;}
 
   // set video in cli config in case of cypress 13 or above as default value is false there.
   this.setVideoCliConfig(bsConfig,conf);