Skip to content

Commit 71c0e14

Browse files
committed
check
1 parent 65e91d6 commit 71c0e14

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

bin/helpers/utils.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,15 +1755,13 @@ exports.getVideoConfig = (cypressConfig, bsConfig = {}) => {
17551755
video: true,
17561756
videoUploadOnPasses: true
17571757
}
1758-
// Reading bsconfig in case of enforce_settings
1759-
if ( this.isUndefined(bsConfig.run_settings) || this.isUndefinedOrFalse(bsConfig.run_settings.enforce_settings) ) {
1760-
if (!this.isUndefined(cypressConfig.video)) conf.video = cypressConfig.video;
1761-
if (!this.isUndefined(cypressConfig.videoUploadOnPasses)) conf.videoUploadOnPasses = cypressConfig.videoUploadOnPasses;
1762-
}
1763-
else {
1764-
if (!this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.video)) conf.video = bsConfig.run_settings.video;
1765-
if (!this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.videoUploadOnPasses)) conf.videoUploadOnPasses = bsConfig.run_settings.videoUploadOnPasses;
1766-
}
1758+
if (!this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.video)) conf.video = bsConfig.run_settings.video;
1759+
if (!this.isUndefined(bsConfig.run_settings) && !this.isUndefined(bsConfig.run_settings.videoUploadOnPasses)) conf.videoUploadOnPasses = bsConfig.run_settings.videoUploadOnPasses;
1760+
if (!this.isUndefined(cypressConfig.video)) { conf.video = cypressConfig.video;}
1761+
if (!this.isUndefined(cypressConfig.videoUploadOnPasses)){ conf.videoUploadOnPasses = cypressConfig.videoUploadOnPasses;}
1762+
if (!this.isUndefined(cypressConfig.e2e) && !this.isUndefined(cypressConfig.e2e.video)) { conf.video = cypressConfig.e2e.video;}
1763+
if (!this.isUndefined(cypressConfig.e2e) && !this.isUndefined(cypressConfig.e2e.videoUploadOnPasses)){ conf.videoUploadOnPasses = cypressConfig.e2e.videoUploadOnPasses;}
1764+
17671765

17681766
// set video in cli config in case of cypress 13 or above as default value is false there.
17691767
this.setVideoCliConfig(bsConfig,conf);

0 commit comments

Comments
 (0)