Merge branch 'master' of github.com:roshan04/browserstack-cypress-cli

Author: roshan04

bin/helpers/capabilityHelper.js

@@ -25,7 +25,7 @@ const caps = (bsConfig, zip) => {
     if (bsConfig.browsers) {
       bsConfig.browsers.forEach((element) => {
         osBrowser = element.os + "-" + element.browser;
-        osAndBrowser = element.os + " / " + Utils.capitalizeFirstLetter(element.browser);
+        osAndBrowser = (element.os) ? element.os : "Any OS" + " / " + Utils.capitalizeFirstLetter(element.browser);
         element.versions.forEach((version) => {
           osBrowserArray.push(osBrowser + version);
           browsersList.push(`${osAndBrowser} (${version})`);

bin/helpers/utils.js

@@ -900,7 +900,7 @@ exports.setBrowsers = async (bsConfig, args) => {
         browsersList.forEach((browser)=>{
           let browserHash = {}
           let osBrowserDetails =  browser.split(':')
-          browserHash['os'] = osBrowserDetails[1].trim()
+          if (!this.isUndefined(osBrowserDetails[1])) browserHash['os'] = osBrowserDetails[1].trim()
           let browserDetails = osBrowserDetails[0].split('@')
           browserHash['browser'] = browserDetails[0].trim()
           browserHash['versions'] = []

test/unit/bin/helpers/utils.js

@@ -2517,6 +2517,61 @@ describe('utils', () => {
       await utils.setBrowsers(bsConfig, args);
       expect(bsConfig.browsers).to.be.eql(browserResult);
     });
+    it('the args browser should not return exception if os is empty string', async () => {
+      let bsConfig = {
+        browsers: [
+          {
+            browser: 'chrome',
+            os: 'Windows 10',
+            versions: ['latest', 'latest-1'],
+          },
+          {
+            browser: 'chrome',
+            os: 'Windows 10',
+            versions: ['latest', 'latest-1'],
+          },
+        ],
+      };
+      let browserResult = [
+        {
+          browser: 'chrome',
+          os: '',
+          versions: ['latest-1'],
+        }
+      ];
+      let args = {
+        browser: 'chrome@latest-1:',
+      };
+      await utils.setBrowsers(bsConfig, args)
+      expect(bsConfig.browsers).to.be.eql(browserResult);
+    });
+    it('the args browser should not return exception if os is nil', async () => {
+      let bsConfig = {
+        browsers: [
+          {
+            browser: 'chrome',
+            os: 'Windows 10',
+            versions: ['latest', 'latest-1'],
+          },
+          {
+            browser: 'chrome',
+            os: 'Windows 10',
+            versions: ['latest', 'latest-1'],
+          },
+        ],
+      };
+      let browserResult = [
+        {
+          browser: 'chrome',
+          versions: ['latest-1'],
+        }
+      ];
+      let args = {
+        browser: 'chrome@latest-1',
+      };
+      await utils.setBrowsers(bsConfig, args)
+      expect(bsConfig.browsers).to.be.eql(browserResult);
+    });
     it('the args browser should throw an error in case of exception raised', async () => {
       let bsConfig = {
         browsers: [