From f5d4a8ee4dd2f016007bd862f1a154dfa4c4b27f Mon Sep 17 00:00:00 2001 From: Raghav Singhak Date: Thu, 9 Oct 2025 11:20:55 +0530 Subject: [PATCH] video-config-fix --- bin/helpers/utils.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/bin/helpers/utils.js b/bin/helpers/utils.js index c451378b..74250861 100644 --- a/bin/helpers/utils.js +++ b/bin/helpers/utils.js @@ -1754,15 +1754,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);