Allow to use any browser with BrowserStack and Appium.

lib/transport/factory.js

@@ -90,12 +90,6 @@ module.exports = class TransportFactory {
       browserName = Browser.EDGE;
     } else if (BrowsersLowerCase[browserName && browserName.toLowerCase()]) {
       browserName = BrowsersLowerCase[browserName.toLowerCase()];
-    } else {
-      const didYouMean = require('didyoumean');
-      const browsersList = Object.values(Browser);
-      const resultMeant = didYouMean(browserName, browsersList);
-
-      throw new Error(`Unknown browser: "${browserName}"${resultMeant ? ('; did you mean "' + resultMeant + '"?') : ''}`);
     }
 
     return browserName;
@@ -154,8 +148,13 @@ module.exports = class TransportFactory {
         Driver = require('./selenium-webdriver/safari.js');
         break;
 
-      default:
-        throw new Error(`Unrecognized browser: ${browserName}.`);
+      default: {
+        const didYouMean = require('didyoumean');
+        const browsersList = Object.values(Browser);
+        const resultMeant = didYouMean(browserName, browsersList);
+
+        throw new Error(`Unknown browser: "${browserName}"${resultMeant ? ('; did you mean "' + resultMeant + '"?') : ''}`);
+      }
     }
 
     return new Driver(nightwatchInstance);

lib/transport/selenium-webdriver/selenium.js

@@ -1,6 +1,9 @@
+const {Capabilities} = require('selenium-webdriver');
+
 const DefaultSeleniumDriver = require('./');
 const SeleniumServiceBuilder = require('./service-builders/selenium.js');
 
+
 module.exports = class SeleniumServer extends DefaultSeleniumDriver {
   /**
    * Used when running in parallel with start_process=true
@@ -66,6 +69,11 @@ module.exports = class SeleniumServer extends DefaultSeleniumDriver {
   }
 
   setBuilderOptions({builder, options}) {
+    if (!(options instanceof Capabilities)) {
+      const browserName = this.initialCapabilities.getBrowserName();
+      throw new Error(`Unknown browser: '${browserName}'`);
+    }
+
     const serverUrl = this.getServerUrl();
 
     builder
@@ -74,8 +82,6 @@ module.exports = class SeleniumServer extends DefaultSeleniumDriver {
 
     return super.setBuilderOptions({builder, options});
   }
-
-
 };
 
 

test/src/core/testCreateSession.js

@@ -376,7 +376,7 @@ describe('test Request With Credentials', function () {
   });
 
   it('Test blank browserName', async function () {
-    assert.throws(function() {
+    try {
       const client = Nightwatch.createClient({
         selenium_port: 10195,
         silent: false,
@@ -386,7 +386,13 @@ describe('test Request With Credentials', function () {
           alwaysMatch: {}
         }
       });
-    }, /Error: Unknown browser:/);
+
+      await client.createSession();
+
+      assert.fail('Error expected.');
+    } catch (err) {
+      assert.strictEqual(err.message.includes('[Error] Unknown browser: \'undefined\''), true);
+    }
   });
 
   it('Test create session with browsername null - Appium support', async function () {
@@ -433,18 +439,32 @@ describe('test Request With Credentials', function () {
     });
   });
 
-  it('Test create session with use_appium property - Appium support', async function () {
+  it('Test create session with use_appium property and random browser - Appium support', async function () {
     nock('http://somewhere:9999')
       .post('/wd/hub/session')
-      .reply(201, {
-        value: {
+      .reply(201, function (uri, requestBody) {
+        assert.deepEqual(requestBody, {
           capabilities: {
-            platformName: 'android',
-            platformVersion: '12.0',
-            name: 'sample test goes here'
-          },
-          sessionId: '1352110219202'
-        }
+            firstMatch: [{}],
+            alwaysMatch: {
+              browserName: 'acmeBrowser',
+              platformName: 'android',
+              'appium:platformVersion': '12.0'
+            }
+          }
+        });
+
+        return {
+          value: {
+            capabilities: {
+              browserName: 'acmeBrowser',
+              platformName: 'android',
+              platformVersion: '12.0',
+              name: 'sample test goes here'
+            },
+            sessionId: '1352110219202'
+          }
+        };
       });
 
     const client = Nightwatch.createClient({
@@ -458,15 +478,16 @@ describe('test Request With Credentials', function () {
         port: 9999
       },
       desiredCapabilities: {
-        browserName: '',
+        browserName: 'acmeBrowser',
         platformName: 'android',
-        platformVersion: '12.0'
+        'appium:platformVersion': '12.0'
       }
     });
 
     const result = await client.createSession();
     assert.deepStrictEqual(result, {
       capabilities: {
+        browserName: 'acmeBrowser',
         platformName: 'android',
         platformVersion: '12.0',
         name: 'sample test goes here'
@@ -925,25 +946,23 @@ describe('test Request With Credentials', function () {
     });
   });
 
-  it('Test create session with browserstack and update buildName', async function () {
+  it('Test create session with browserstack with random browser and update buildName', async function () {
     nock('https://hub.browserstack.com')
       .post('/wd/hub/session')
       .reply(201, function (uri, requestBody) {
-
         assert.deepEqual(requestBody, {
           capabilities: {
             firstMatch: [{}],
             alwaysMatch: {
-              browserName: 'chrome',
+              browserName: 'acmeBrowser',
               'bstack:options': {
                 local: 'false',
                 userName: 'test_user',
                 accessKey: 'test_key',
                 os: 'OS X',
                 osVersion: 'Monterey',
                 buildName: 'Nightwatch Programmatic Api Demo'
-              },
-              'goog:chromeOptions': {w3c: false}
+              }
             }
           }
         });
@@ -995,12 +1014,8 @@ describe('test Request With Credentials', function () {
           os: 'OS X',
           osVersion: 'Monterey'
         },
-        browserName: 'chrome',
-        chromeOptions: {
-          w3c: false
-        }
+        browserName: 'acmeBrowser'
       },
-
       parallel: false
     });
 
@@ -1015,16 +1030,15 @@ describe('test Request With Credentials', function () {
       capabilities: {
         firstMatch: [{}],
         alwaysMatch: {
-          browserName: 'chrome',
+          browserName: 'acmeBrowser',
           'bstack:options': {
             local: 'false',
             userName: 'test_user',
             accessKey: 'test_key',
             os: 'OS X',
             osVersion: 'Monterey',
             buildName: 'Nightwatch Programmatic Api Demo'
-          },
-          'goog:chromeOptions': {w3c: false}
+          }
         }
       }
     });