Merged master

Author: pawanpanjwani

bin/commands/runs.js

@@ -31,7 +31,7 @@ function runCypress(args) {
     util.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
 
     // Validate browserstack.json values
-    capabilityHelper.validate(bsConfig).then(function (validated) {
+    capabilityHelper.validate(bsConfig, args).then(function (validated) {
       logger.info(validated);
 
       // Archive the spec files

bin/helpers/capabilityHelper.js

@@ -1,5 +1,6 @@
 const logger = require("./logger").winstonLogger,
-  Constants = require("./constants");
+  Constants = require("./constants"),
+  Util = require("./util");
 
 const caps = (bsConfig, zip) => {
   return new Promise(function (resolve, reject) {
@@ -61,7 +62,7 @@ const caps = (bsConfig, zip) => {
   })
 }
 
-const validate = (bsConfig) => {
+const validate = (bsConfig, args) => {
   return new Promise(function(resolve, reject){
     if (!bsConfig) reject(Constants.validationMessages.EMPTY_BROWSERSTACK_JSON);
 
@@ -71,7 +72,15 @@ const validate = (bsConfig) => {
 
     if (!bsConfig.run_settings) reject(Constants.validationMessages.EMPTY_RUN_SETTINGS);
 
-    if(!bsConfig.run_settings.cypress_proj_dir) reject(Constants.validationMessages.EMPTY_SPEC_FILES);
+    if (!bsConfig.run_settings.cypress_proj_dir) reject(Constants.validationMessages.EMPTY_SPEC_FILES);
+
+    // validate parallels specified in browserstack.json if parallels are not specified via arguments
+    if (Util.isUndefined(args.parallels) && !Util.isParallelValid(bsConfig.run_settings.parallels)) {
+      reject(Constants.validationMessages.INVALID_PARALLES_CONFIGURATION);
+    }
+    // if parallels specified via arguments validate both parallels specifed in browserstack.json and parallels specified in arguments
+    if (!Util.isUndefined(args.parallels) && !Util.isParallelValid(args.parallels)) reject(Constants.validationMessages.INVALID_PARALLES_CONFIGURATION);
+
 
     resolve(Constants.validationMessages.VALIDATED);
   });

bin/helpers/constants.js

@@ -24,6 +24,7 @@ const validationMessages = {
   NOT_VALID: "browerstack.json is not valid",
   NOT_VALID_JSON: "browerstack.json is not a valid json",
   INVALID_EXTENSION: "Invalid files, please remove these files and try again.",
+  INVALID_PARALLES_CONFIGURATION: "Invalid type of parallel, accepted values are positive or -1.",
 };
 
 const cliMessages = {

bin/helpers/util.js

@@ -70,6 +70,20 @@ exports.setUsageReportingFlag = (bsConfig, disableUsageReporting) => {
   }
 }
 
+exports.setParallels = (bsConfig, args) => {
+  if ((args.parallels !== undefined && !isNaN(args.parallels)) && bsConfig && (bsConfig['run_settings']['parallels'] === undefined || bsConfig['run_settings']['parallels'])) {
+    bsConfig['run_settings']['parallels'] = args.parallels;
+  }
+}
+
+exports.isUndefined = value => (value === undefined || value === null || value === '');
+
+exports.isFloat = value => (Number(value) && Number(value) % 1 !== 0);
+
+exports.isParallelValid = (value) => {
+  return this.isUndefined(value) || !(isNaN(value) || this.isFloat(value) || parseInt(value, 10) === 0 || parseInt(value, 10) < -1);
+}
+
 exports.getUserAgent = () => {
   return `BStack-Cypress-CLI/1.x (${os.arch()}/${os.platform()}/${os.release()})`;
 }

bin/templates/configTemplate.js

@@ -15,6 +15,7 @@ module.exports = function () {
       "cypress_proj_dir" : "/path/to/cypress.json",
       "project_name": "project-name",
       "build_name": "build-name",
+      "parallels": "number of parallels to run",
       "npm_dependencies": {
       }
     },