selenium-webdriver 4.8.2 → 4.9.1

package/firefox.js

@@ -127,7 +127,7 @@ const webdriver = require('./lib/webdriver')
 const zip = require('./io/zip')
 const { Browser, Capabilities } = require('./lib/capabilities')
 const { Zip } = require('./io/zip')
-const { driverLocation } = require('./common/seleniumManager')
+const { getPath } = require('./common/driverFinder')
 
 /**
  * Thrown when there an add-on is malformed.
@@ -471,25 +471,7 @@ function locateSynchronously() {
  * @throws {Error}
  */
 function findGeckoDriver() {
-  let exe = locateSynchronously()
-
-  if (!exe) {
-    try {
-      exe = driverLocation(Browser.FIREFOX)
-    } catch (err) {
-      console.log(`Unable to obtain driver using Selenium Manager: ${err}`)
-    }
-  }
-
-  if (!exe) {
-    throw Error(
-      `GeckoDriver could not be found on the PATH.
-      For more information on how to install drivers see
-      https://www.selenium.dev/documentation/webdriver/getting_started/install_drivers/.`
-    )
-  }
-
-  return exe
+  return locateSynchronously()
 }
 
 /**
@@ -626,10 +608,16 @@ class Driver extends webdriver.WebDriver {
       executor = opt_executor
       configureExecutor(executor)
     } else if (opt_executor instanceof remote.DriverService) {
+      if (!opt_executor.getExecutable()) {
+        opt_executor.setExecutable(getPath(opt_executor, opt_config))
+      }
       executor = createExecutor(opt_executor.start())
       onQuit = () => opt_executor.kill()
     } else {
       let service = new ServiceBuilder().build()
+      if (!service.getExecutable()) {
+        service.setExecutable(getPath(service, opt_config))
+      }
       executor = createExecutor(service.start())
       onQuit = () => service.kill()
     }

package/http/index.js

@@ -54,7 +54,8 @@ function getRequestOptions(aUrl) {
   options.search = null
   options.hash = null
   options.path = options.pathname
- options.hostname = options.hostname === 'localhost' ? '127.0.0.1' : options.hostname // To support Node 17 and above. Refer https://github.com/nodejs/node/issues/40702 for details.
+  options.hostname =
+    options.hostname === 'localhost' ? '127.0.0.1' : options.hostname // To support Node 17 and above. Refer https://github.com/nodejs/node/issues/40702 for details.
   return options
 }
 

package/ie.js

@@ -35,7 +35,7 @@ const remote = require('./remote')
 const webdriver = require('./lib/webdriver')
 const { Browser, Capabilities } = require('./lib/capabilities')
 const error = require('./lib/error')
-const { driverLocation } = require('./common/seleniumManager')
+const { getPath } = require('./common/driverFinder')
 
 const IEDRIVER_EXE = 'IEDriverServer.exe'
 const OPTIONS_CAPABILITY_KEY = 'se:ieOptions'
@@ -400,22 +400,6 @@ function createServiceFromCapabilities(capabilities) {
   }
 
   let exe = locateSynchronously()
-  if (!exe) {
-    try {
-      exe = driverLocation('iexplorer')
-    } catch (err) {
-      console.log(`Unable to obtain driver using Selenium Manager: ${err}`)
-    }
-  }
-
-  if (!exe || !fs.existsSync(exe)) {
-    throw Error(
-      `IEDriver could not be found on the PATH.
-      For more information on how to install drivers see
-      https://www.selenium.dev/documentation/webdriver/getting_started/install_drivers/.`
-    )
-  }
-
   var args = []
   if (capabilities.has(Key.HOST)) {
     args.push('--host=' + capabilities.get(Key.HOST))
@@ -482,6 +466,9 @@ class Driver extends webdriver.WebDriver {
     } else {
       service = createServiceFromCapabilities(options)
     }
+    if (!service.getExecutable()) {
+      service.setExecutable(getPath(service, options))
+    }
 
     let client = service.start().then((url) => new http.HttpClient(url))
     let executor = new http.Executor(client)

package/index.js

@@ -41,6 +41,8 @@ const webdriver = require('./lib/webdriver')
 const select = require('./lib/select')
 const LogInspector = require('./bidi/logInspector')
 const BrowsingContext = require('./bidi/browsingContext')
+const BrowsingConextInspector = require('./bidi/browsingContextInspector')
+const ScriptManager = require('./bidi/scriptManager')
 
 const Browser = capabilities.Browser
 const Capabilities = capabilities.Capabilities
@@ -799,3 +801,5 @@ exports.until = until
 exports.Select = select.Select
 exports.LogInspector = LogInspector
 exports.BrowsingContext = BrowsingContext
+exports.BrowsingConextInspector = BrowsingConextInspector
+exports.ScriptManager = ScriptManager

package/lib/http.js

@@ -189,7 +189,10 @@ function toExecuteAtomCommand(command, atom, name, ...params) {
 
   return new cmd.Command(cmd.Name.EXECUTE_SCRIPT)
     .setParameter('sessionId', command.getParameter('sessionId'))
-    .setParameter('script', `/* ${name} */return (${atom}).apply(null, arguments)`)
+    .setParameter(
+      'script',
+      `/* ${name} */return (${atom}).apply(null, arguments)`
+    )
     .setParameter(
       'args',
       params.map((param) => command.getParameter(param))
@@ -252,7 +255,12 @@ const W3C_COMMAND_MAP = new Map([
   [
     cmd.Name.FIND_ELEMENTS_RELATIVE,
     (cmd) => {
-      return toExecuteAtomCommand(cmd, Atom.FIND_ELEMENTS, 'findElements', 'args')
+      return toExecuteAtomCommand(
+        cmd,
+        Atom.FIND_ELEMENTS,
+        'findElements',
+        'args'
+      )
     },
   ],
   [
@@ -272,7 +280,13 @@ const W3C_COMMAND_MAP = new Map([
   [
     cmd.Name.GET_ELEMENT_ATTRIBUTE,
     (cmd) => {
-      return toExecuteAtomCommand(cmd, Atom.GET_ATTRIBUTE, 'getAttribute', 'id', 'name')
+      return toExecuteAtomCommand(
+        cmd,
+        Atom.GET_ATTRIBUTE,
+        'getAttribute',
+        'id',
+        'name'
+      )
     },
   ],
   [

package/lib/webdriver.js

@@ -2252,11 +2252,13 @@ class Window {
    */
   async getSize(windowHandle = 'current') {
     if (windowHandle !== 'current') {
-      console.warn(`Only 'current' window is supported for W3C compatible browsers.`);
+      console.warn(
+        `Only 'current' window is supported for W3C compatible browsers.`
+      )
     }
 
-    const rect = await this.getRect();
-    return {height: rect.height, width: rect.width};
+    const rect = await this.getRect()
+    return { height: rect.height, width: rect.width }
   }
 
   /**
@@ -2268,12 +2270,17 @@ class Window {
    * @param windowHandle
    * @returns {Promise<void>}
    */
-  async setSize({x = 0, y = 0, width = 0, height = 0}, windowHandle = 'current') {
+  async setSize(
+    { x = 0, y = 0, width = 0, height = 0 },
+    windowHandle = 'current'
+  ) {
     if (windowHandle !== 'current') {
-      console.warn(`Only 'current' window is supported for W3C compatible browsers.`);
+      console.warn(
+        `Only 'current' window is supported for W3C compatible browsers.`
+      )
     }
 
-    await this.setRect({x, y, width, height});
+    await this.setRect({ x, y, width, height })
   }
 }
 
@@ -3006,7 +3013,7 @@ class WebElement {
       "e.initEvent('submit', true, true);\n" +
       'if (form.dispatchEvent(e)) { HTMLFormElement.prototype.submit.call(form) }\n'
 
-    this.driver_.executeScript(script, this)
+    return this.driver_.executeScript(script, this)
   }
 
   /**

package/package.json

@@ -1,6 +1,7 @@
+
 {
   "name": "selenium-webdriver",
-  "version": "4.8.2",
+  "version": "4.9.1",
   "description": "The official WebDriver JavaScript bindings from the Selenium project",
   "license": "Apache-2.0",
   "keywords": [
@@ -23,25 +24,25 @@
     "node": ">= 14.20.0"
   },
   "dependencies": {
-    "jszip": "^3.10.0",
+    "jszip": "^3.10.1",
     "tmp": "^0.2.1",
-    "ws": ">=8.11.0"
+    "ws": ">=8.13.0"
   },
   "devDependencies": {
-    "eslint": "^8.31.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.37.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "express": "^4.18.2",
     "mocha": "^10.2.0",
     "multer": "^1.4.5-lts.1",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.7",
     "serve-index": "^1.9.1",
-    "sinon": "^14.0.2"
+    "sinon": "^15.0.3"
   },
   "scripts": {
-    "lint": "eslint --ignore-pattern node_modules --ignore-pattern generator --fix --ext js lib/http.js \"**/*.js\"",
+    "lint": "eslint --ignore-pattern node_modules --ignore-pattern generator --ext js lib/http.js \"**/*.js\"",
     "test": "npm run lint && mocha -t 600000 --recursive test",
     "test-jasmine": "bazel test //javascript/node/selenium-webdriver:tests"
   },

package/remote/index.js

@@ -167,6 +167,14 @@ class DriverService {
     this.address_ = null
   }
 
+  getExecutable() {
+    return this.executable_
+  }
+
+  setExecutable(value) {
+    this.executable_ = value
+  }
+
   /**
    * @return {!Promise<string>} A promise that resolves to the server's address.
    * @throws {Error} If the server has not been started.
@@ -318,10 +326,6 @@ DriverService.Builder = class {
    * @throws {Error} If the provided executable path does not exist.
    */
   constructor(exe) {
-    if (!fs.existsSync(exe)) {
-      throw Error(`The specified executable path does not exist: ${exe}`)
-    }
-
     /** @private @const {string} */
     this.exe_ = exe
 

package/remote/util.js

@@ -52,7 +52,9 @@ function isSelenium3x(seleniumStandalonePath) {
  */
 function formatSpawnArgs(seleniumStandalonePath, args) {
   if (isSelenium3x(seleniumStandalonePath)) {
-    console.warn('Deprecation: Support for Standalone Server 3.x will be removed soon. Please update to version 4.x')
+    console.warn(
+      'Deprecation: Support for Standalone Server 3.x will be removed soon. Please update to version 4.x'
+    )
     return args
   }