Added unit test cases and handle -1 parallels case

Author: karanshah-browserstack

bin/commands/runs.js

@@ -48,7 +48,7 @@ module.exports = function run(args) {
     return capabilityHelper.validate(bsConfig, args).then(function (cypressJson) {
 
       //get the number of spec files
-      let specFiles = utils.getNumberOfSpecFiles(bsConfig,args,cypressJson);
+      let specFiles = utils.getNumberOfSpecFiles(bsConfig, args, cypressJson);
 
       // accept the number of parallels
       utils.setParallels(bsConfig, args, specFiles.length);

bin/helpers/constants.js

@@ -91,7 +91,7 @@ const allowedFileTypes = ['js', 'json', 'txt', 'ts', 'feature', 'features', 'pdf
 
 const filesToIgnoreWhileUploading = ['node_modules/**', 'package-lock.json', 'package.json', 'browserstack-package.json', 'tests.zip', 'cypress.json']
 
-const specFileTypes = ['js', 'ts', 'feature', 'jsx', 'coffee', 'cjsx']
+const specFileTypes = ['js', 'ts', 'feature']
 
 const DEFAULT_CYPRESS_SPEC_PATH = "cypress/integration"
 

bin/helpers/utils.js

@@ -116,7 +116,11 @@ exports.setParallels = (bsConfig, args, numOfSpecs) => {
   }
   let browserCombinations = this.getBrowserCombinations(bsConfig);
   let maxParallels = browserCombinations.length * numOfSpecs;
-  if (bsConfig['run_settings']['parallels'] > maxParallels) {
+  if (numOfSpecs <= 0) {
+    bsConfig['run_settings']['parallels'] = browserCombinations.length;
+    return;
+  }
+  if (bsConfig['run_settings']['parallels'] > maxParallels && bsConfig['run_settings']['parallels'] != -1 ) {
     logger.warn(
       `Using ${maxParallels} machines instead of ${bsConfig['run_settings']['parallels']} that you configured as there are ${numOfSpecs} specs to be run on ${browserCombinations.length} browser combinations.`
     );

test/unit/bin/helpers/utils.js

@@ -140,13 +140,25 @@ describe('utils', () => {
   });
 
   describe('setParallels', () => {
+    var sandbox;
+    beforeEach(() => {
+      sandbox = sinon.createSandbox();
+      sandbox.stub(utils,'getBrowserCombinations').returns(['a','b']);
+    });
+    
+    afterEach(() => {
+      sandbox.restore();
+      sinon.restore();
+    });
+
     it('should set bsconfig parallels equal to value provided in args', () => {
       let bsConfig = {
         run_settings: {
           parallels: 10,
         },
       };
-      utils.setParallels(bsConfig, {parallels: 100});
+
+      utils.setParallels(bsConfig, {parallels: 100}, 100);
       expect(bsConfig['run_settings']['parallels']).to.be.eq(100);
     });
 
@@ -156,9 +168,40 @@ describe('utils', () => {
           parallels: 10,
         },
       };
-      utils.setParallels(bsConfig, {parallels: undefined});
+      utils.setParallels(bsConfig, {parallels: undefined}, 10);
       expect(bsConfig['run_settings']['parallels']).to.be.eq(10);
     });
+
+    it('should set bsconfig parallels to browserCombinations.length if numOfSpecs is zero', () => {
+      let bsConfig = {
+        run_settings: {
+          parallels: 10,
+        },
+      };
+      utils.setParallels(bsConfig, {parallels: undefined}, 0);
+      expect(bsConfig['run_settings']['parallels']).to.be.eq(2);
+    });
+
+    it('shouldnot set bsconfig parallels if parallels is -1', () => {
+      let bsConfig = {
+        run_settings: {
+          parallels: -1,
+        },
+      };
+      utils.setParallels(bsConfig, {parallels: undefined}, 2);
+      expect(bsConfig['run_settings']['parallels']).to.be.eq(-1);
+    });
+
+    it('should set bsconfig parallels if parallels is greater than numOfSpecs * combinations', () => {
+      let bsConfig = {
+        run_settings: {
+          parallels: 100,
+        },
+      };
+      utils.setParallels(bsConfig, {parallels: undefined}, 2);
+      expect(bsConfig['run_settings']['parallels']).to.be.eq(4);
+    });
+
   });
 
   describe('getErrorCodeFromErr', () => {