[javascript] Selenium Manager get Browser Version from Options classes

Author: diemol

javascript/javascript.iml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
+  <component name="ModuleRunConfigurationManager">
+    <shared />
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />

javascript/node/selenium-webdriver/common/driverFinder.js

@@ -30,8 +30,7 @@ const fs = require('fs')
  */
 function getPath(service, capabilities) {
   try {
-    return pathExists(service.getExecutable()) ||
-           driverLocation(capabilities.getBrowserName())
+    return pathExists(service.getExecutable()) || driverLocation(capabilities)
   } catch (e) {
       throw Error(
         `Unable to obtain browser driver.

javascript/node/selenium-webdriver/common/seleniumManager.js

@@ -58,18 +58,24 @@ function getBinary() {
 
 /**
  * Determines the path of the correct driver
- * @param {Browser|string} browser name to fetch the driver
+ * @param {Capabilities} options browser options to fetch the driver
  * @returns {string} path of the driver location
  */
 
-function driverLocation(browser) {
-  if (!Browser.includes(browser.toLocaleString())) {
+function driverLocation(options) {
+  if (!Browser.includes(options.getBrowserName().toLocaleString())) {
     throw new Error(
-      `Unable to locate driver associated with browser name: ${browser}`
+      `Unable to locate driver associated with browser name: ${options.getBrowserName()}`
     )
   }
 
-  let args = [getBinary(), '--browser', browser, '--output', 'json']
+  let args = [getBinary(), '--browser', options.getBrowserName(), '--output', 'json']
+
+  if (options.getBrowserVersion() && options.getBrowserVersion() !== "") {
+    console.log("Present browserVersion! " + options.getBrowserVersion())
+    args.push("--browser-version", options.getBrowserVersion())
+  }
+
   let output
 
   try {