[javascript] Selenium Manager use binary from Browser Options

SeleniumHQ#11351
xdsswar · Apr 17, 2023 · 93a00d5 · 93a00d5
1 parent 2c1bd8e
commit 93a00d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/javascript/node/selenium-webdriver/common/seleniumManager.js b/javascript/node/selenium-webdriver/common/seleniumManager.js
@@ -72,20 +72,28 @@ function driverLocation(options) {
  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
+ const vendorOptions = options.get('goog:chromeOptions') || options.get('ms:edgeOptions')
+ || options.get('moz:firefoxOptions')
+ if (vendorOptions && vendorOptions.binary && vendorOptions.binary !== "") {
+ args.push("--browser-path", '"' + vendorOptions.binary + '"')
+ }
 
+ let output
  try {
  output = JSON.parse(execSync(args.join(' ')).toString())
  } catch (e) {
  let error
  try {
  error = JSON.parse(e.stdout.toString()).result.message
  } catch (e) {
- error = e.toString()
+ if (e instanceof SyntaxError) {
+ error = e.stdout.toString()
+ } else {
+ error = e.toString()
+ }
  }
  throw new Error(`Error executing command with ${args}: ${error}`)
  }

diff --git a/third_party/third_party.iml b/third_party/third_party.iml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
+ <component name="ModuleRunConfigurationManager">
+ <shared />
+ </component>
  <component name="NewModuleRootManager" inherit-compiler-output="true">
  <exclude-output />
  <content url="file:https://$MODULE_DIR$">