Skip to content

Commit c06e871

Browse files
committed
Made syntax more clearer
1 parent 0c77d91 commit c06e871

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

bin/commands/runs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = function run(args) {
1616
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
1717

1818
// Validate browserstack.json values
19-
return capabilityHelper.validate(bsConfig).then(function (validated) {
19+
return capabilityHelper.validate(bsConfig, args).then(function (validated) {
2020
logger.info(validated);
2121

2222
// accept the number of parallels

bin/helpers/capabilityHelper.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,11 @@ const validate = (bsConfig, args) => {
9696
if (!bsConfig.run_settings.cypress_proj_dir) reject(Constants.validationMessages.EMPTY_SPEC_FILES);
9797

9898
// validate parallels specified in browserstack.json if parallels are not specified via arguments
99-
if (Utils.isUndefined(args.parallels) && !Utils.isParallelValid(bsConfig.run_settings.parallels)) {
100-
reject(Constants.validationMessages.INVALID_PARALLELS_CONFIGURATION);
101-
}
102-
// if parallels specified via arguments validate both parallels specifed in browserstack.json and parallels specified in arguments
99+
if (Utils.isUndefined(args.parallels) && !Utils.isParallelValid(bsConfig.run_settings.parallels)) reject(Constants.validationMessages.INVALID_PARALLELS_CONFIGURATION);
100+
101+
// if parallels specified via arguments validate only arguments
103102
if (!Utils.isUndefined(args.parallels) && !Utils.isParallelValid(args.parallels)) reject(Constants.validationMessages.INVALID_PARALLELS_CONFIGURATION);
104103

105-
106-
if (!args.parallels) {
107-
if (Number.isNaN(bsConfig.run_settings.parallels) || (parseInt(bsConfig.run_settings.parallels, 10) < 0 && parseInt(bsConfig.run_settings.parallels, 10) != -1))
108-
reject(Constants.validationMessages.INVALID_PARALLELS_CONFIGURATION)
109-
};
110-
111104
resolve(Constants.validationMessages.VALIDATED);
112105
});
113106
}

bin/helpers/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ exports.setUsageReportingFlag = (bsConfig, disableUsageReporting) => {
7171
}
7272

7373
exports.setParallels = (bsConfig, args) => {
74-
if ((args.parallels !== undefined && !isNaN(args.parallels)) && bsConfig && (bsConfig['run_settings']['parallels'] === undefined || bsConfig['run_settings']['parallels'])) {
74+
if (!this.isUndefined(args.parallels)) {
7575
bsConfig['run_settings']['parallels'] = args.parallels;
7676
}
7777
}

0 commit comments

Comments
 (0)