diff --git a/bin/commands/runs.js b/bin/commands/runs.js index d6531d08..e6b8c713 100644 --- a/bin/commands/runs.js +++ b/bin/commands/runs.js @@ -68,8 +68,8 @@ module.exports = function run(args) { logger.warn(Constants.userMessages.NO_PARALLELS); } - if (bsConfig.cypress_version && bsConfig.cypress_version !== data.cypress_version) { - let versionMessage = utils.versionChangedMessage(bsConfig.cypress_version, data.cypress_version) + if (bsConfig.run_settings.cypress_version && bsConfig.run_settings.cypress_version !== data.cypress_version) { + let versionMessage = utils.versionChangedMessage(bsConfig.run_settings.cypress_version, data.cypress_version) logger.warn(versionMessage); } diff --git a/bin/helpers/capabilityHelper.js b/bin/helpers/capabilityHelper.js index 497a1223..9cecfe81 100644 --- a/bin/helpers/capabilityHelper.js +++ b/bin/helpers/capabilityHelper.js @@ -81,10 +81,11 @@ const caps = (bsConfig, zip) => { if (!Utils.isUndefined(bsConfig.run_settings.env)){ obj.env = bsConfig.run_settings.env; } + if (!Utils.isUndefined(bsConfig.run_settings.cypress_version)){ + obj.cypress_version = bsConfig.run_settings.cypress_version; + } } - if (bsConfig.cypress_version) obj.cypress_version = bsConfig.cypress_version; - if(obj.parallels === Constants.cliMessages.RUN.DEFAULT_PARALLEL_MESSAGE) obj.parallels = undefined if (obj.project) logger.log(`Project name is: ${obj.project}`); diff --git a/test/unit/bin/helpers/capabilityHelper.js b/test/unit/bin/helpers/capabilityHelper.js index 5de63406..7890362a 100644 --- a/test/unit/bin/helpers/capabilityHelper.js +++ b/test/unit/bin/helpers/capabilityHelper.js @@ -59,7 +59,9 @@ describe("capabilityHelper.js", () => { versions: ["78", "77"], }, ], - cypress_version: cypress_version, + run_settings: { + cypress_version: cypress_version + }, connection_settings: { local: true } @@ -113,6 +115,9 @@ describe("capabilityHelper.js", () => { versions: ["78", "77"], }, ], + run_settings: { + cypress_version: "cypress_version" + }, connection_settings: { local: true }