selenium-webdriver 4.1.0 → 4.2.0

package/net/index.js

@@ -35,10 +35,10 @@ function getLoInterface() {
  * @param {string} family The IP family (IPv4 or IPv6). Defaults to IPv4.
  * @return {(string|undefined)} The located IP address or undefined.
  */
-function getAddress(loopback, family) {
+function getIPAddress(loopback, family) {
   let interfaces
   if (loopback) {
-    let lo = getLoInterface()
+    const lo = getLoInterface()
     interfaces = lo ? [lo] : null
   }
   interfaces = interfaces || os.networkInterfaces()
@@ -48,7 +48,7 @@ function getAddress(loopback, family) {
     }
 
     for (let ipAddress of interfaces[key]) {
-      if (ipAddress.family === family && ipAddress.internal === loopback) {
+      if ((ipAddress.family === family || `IPv${ipAddress.family}` === family) && ipAddress.internal === loopback) {
         return ipAddress.address
       }
     }
@@ -63,8 +63,8 @@ function getAddress(loopback, family) {
  * @param {string=} family The IP family to retrieve. Defaults to "IPv4".
  * @return {(string|undefined)} The IP address or undefined if not available.
  */
-exports.getAddress = function (family = 'IPv4') {
-  return getAddress(false, family)
+function getAddress(family = 'IPv4') {
+  return getIPAddress(false, family)
 }
 
 /**
@@ -72,8 +72,8 @@ exports.getAddress = function (family = 'IPv4') {
  * @param {string=} family The IP family to retrieve. Defaults to "IPv4".
  * @return {(string|undefined)} The IP address or undefined if not available.
  */
-exports.getLoopbackAddress = function (family = 'IPv4') {
-  return getAddress(true, family)
+function getLoopbackAddress(family = 'IPv4') {
+  return getIPAddress(true, family)
 }
 
 /**
@@ -84,7 +84,7 @@ exports.getLoopbackAddress = function (family = 'IPv4') {
  * @return {{host: string, port: ?number}} A host and port. If no port is
  *     present in the argument `hostport`, port is null.
  */
-exports.splitHostAndPort = function (hostport) {
+function splitHostAndPort(hostport) {
   let lastIndex = hostport.lastIndexOf(':')
   if (lastIndex < 0) {
     return { host: hostport, port: null }
@@ -105,3 +105,10 @@ exports.splitHostAndPort = function (hostport) {
   let port = parseInt(hostport.slice(lastIndex + 1), 10)
   return { host, port }
 }
+
+// PUBLIC API
+module.exports = {
+  splitHostAndPort,
+  getLoopbackAddress,
+  getAddress,
+}

package/net/portprober.js

@@ -70,6 +70,7 @@ function findFreePort(opt_host) {
 }
 
 // PUBLIC API
-
-exports.findFreePort = findFreePort
-exports.isFree = isFree
+module.exports = {
+  findFreePort,
+  isFree,
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "selenium-webdriver",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "The official WebDriver JavaScript bindings from the Selenium project",
   "license": "Apache-2.0",
   "keywords": [
@@ -35,7 +35,7 @@
     "eslint-plugin-prettier": "^3.4.0",
     "express": "^4.17.1",
     "jasmine": "^3.8.0",
-    "mocha": "^8.1.0",
+    "mocha": "^9.2.2",
     "multer": "^1.4.2",
     "prettier": "^2.3.0",
     "serve-index": "^1.9.1",

package/remote/index.js

@@ -33,12 +33,12 @@ const portprober = require('../net/portprober')
 /**
  * @typedef {(string|!Array<string|number|!stream.Stream|null|undefined>)}
  */
-var StdIoOptions // eslint-disable-line
+let StdIoOptions // eslint-disable-line
 
 /**
  * @typedef {(string|!IThenable<string>)}
  */
-var CommandLineFlag // eslint-disable-line
+let CommandLineFlag // eslint-disable-line
 
 /**
  * A record object that defines the configuration options for a DriverService
@@ -196,8 +196,8 @@ class DriverService {
       return this.address_
     }
 
-    var timeout = opt_timeoutMs || DriverService.DEFAULT_START_TIMEOUT_MS
-    var self = this
+    const timeout = opt_timeoutMs || DriverService.DEFAULT_START_TIMEOUT_MS
+    const self = this
 
     let resolveCommand
     this.command_ = new Promise((resolve) => (resolveCommand = resolve))
@@ -567,7 +567,7 @@ SeleniumServer.Options = class {
  * When a file path on the local machine running this script is entered with
  * {@link webdriver.WebElement#sendKeys WebElement#sendKeys}, this file detector
  * will transfer the specified file to the Selenium server's host; the sendKeys
- * command will be updated to use the transfered file's path.
+ * command will be updated to use the transferred file's path.
  *
  * __Note:__ This class depends on a non-standard command supported on the
  * Java Selenium server. The file detector will fail if used with a server that
@@ -618,7 +618,10 @@ class FileDetector extends input.FileDetector {
 
 // PUBLIC API
 
-exports.DriverService = DriverService
-exports.FileDetector = FileDetector
-exports.SeleniumServer = SeleniumServer
-exports.ServiceOptions = ServiceOptions // Exported for API docs.
+module.exports = {
+  DriverService,
+  FileDetector,
+  SeleniumServer,
+  // Exported for API docs.
+  ServiceOptions,
+}

package/safari.js

@@ -154,9 +154,9 @@ class Driver extends webdriver.WebDriver {
       service.start().then((url) => new http.HttpClient(url))
     )
 
-    return /** @type {!Driver} */ (super.createSession(executor, caps, () =>
-      service.kill()
-    ))
+    return /** @type {!Driver} */ (
+      super.createSession(executor, caps, () => service.kill())
+    )
   }
 }
 

package/testing/index.js

@@ -39,7 +39,6 @@ const firefox = require('../firefox')
 const ie = require('../ie')
 const remote = require('../remote')
 const safari = require('../safari')
-const opera = require('../opera')
 const { Browser, Capabilities } = require('../lib/capabilities')
 const { Builder } = require('../index')
 
@@ -47,7 +46,7 @@ const { Builder } = require('../index')
  * Describes a browser targeted by a {@linkplain suite test suite}.
  * @record
  */
-function TargetBrowser() {}
+function TargetBrowser() { }
 
 /**
  * The {@linkplain Browser name} of the targeted browser.
@@ -89,7 +88,7 @@ function warn(msg) {
  * Extracts the browsers for a test suite to target from the `SELENIUM_BROWSER`
  * environment variable.
  *
- * @return {!Array<!TargetBrowser>} the browsers to target.
+ * @return {{name: string, version: string, platform: string}[]} the browsers to target.
  */
 function getBrowsersToTestFromEnv() {
   let browsers = process.env['SELENIUM_BROWSER']
@@ -123,7 +122,6 @@ function getAvailableBrowsers() {
     [firefox.locateSynchronously, Browser.FIREFOX],
     [ie.locateSynchronously, Browser.INTERNET_EXPLORER],
     [safari.locateSynchronously, Browser.SAFARI],
-    [opera.locateSynchronously, Browser.OPERA],
   ]
 
   let availableBrowsers = []
@@ -210,7 +208,7 @@ function init(force = false) {
   if (seleniumJar && seleniumUrl) {
     throw Error(
       'Ambiguous test configuration: both SELENIUM_REMOTE_URL' +
-        ' && SELENIUM_SERVER_JAR environment variables are set'
+      ' && SELENIUM_SERVER_JAR environment variables are set'
     )
   }
 
@@ -218,8 +216,8 @@ function init(force = false) {
   if ((seleniumJar || seleniumUrl) && envBrowsers.length === 0) {
     throw Error(
       'Ambiguous test configuration: when either the SELENIUM_REMOTE_URL or' +
-        ' SELENIUM_SERVER_JAR environment variable is set, the' +
-        ' SELENIUM_BROWSER variable must also be set.'
+      ' SELENIUM_SERVER_JAR environment variable is set, the' +
+      ' SELENIUM_BROWSER variable must also be set.'
     )
   }
 
@@ -272,7 +270,7 @@ class Environment {
    * @return {function(): boolean} a new predicate function.
    */
   browsers(...browsersToIgnore) {
-    return () => browsersToIgnore.indexOf(this.browser.name) != -1
+    return () => browsersToIgnore.indexOf(this.browser.name) !== -1
   }
 
   /**
@@ -286,12 +284,19 @@ class Environment {
     const builder = new Builder()
     builder.disableEnvironmentOverrides()
 
+
+
     const realBuild = builder.build
     builder.build = function () {
-      builder.withCapabilities(Capabilities[browser.name].apply(Capabilities))
+      builder.forBrowser(browser.name, browser.version, browser.platform);
+
 
       if (browser.capabilities) {
-        builder.getCapabilities().merge(browser.capabilities)
+        builder.getCapabilities().merge(browser.capabilities);
+      }
+
+      if (browser.name === 'firefox') {
+        builder.setCapability('moz:debuggerAddress', true);
       }
 
       if (typeof urlOrServer === 'string') {
@@ -310,7 +315,7 @@ class Environment {
  * Configuration options for a {@linkplain ./index.suite test suite}.
  * @record
  */
-function SuiteOptions() {}
+function SuiteOptions() { }
 
 /**
  * The browsers to run the test suite against.
@@ -485,8 +490,8 @@ function getTestHook(name) {
   if (type !== 'function') {
     throw TypeError(
       `Expected global.${name} to be a function, but is ${type}.` +
-        ' This can happen if you try using this module when running with' +
-        ' node directly instead of using jasmine or mocha'
+      ' This can happen if you try using this module when running with' +
+      ' node directly instead of using jasmine or mocha'
     )
   }
   return fn

package/opera.js

@@ -1,406 +0,0 @@
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-/**
- * @fileoverview Defines a {@linkplain Driver WebDriver} client for the
- * Opera web browser (v26+). Before using this module, you must download the
- * latest OperaDriver
- * [release](https://github.com/operasoftware/operachromiumdriver/releases) and
- * ensure it can be found on your system
- * [PATH](http://en.wikipedia.org/wiki/PATH_%28variable%29).
- *
- * There are three primary classes exported by this module:
- *
- * 1. {@linkplain ServiceBuilder}: configures the
- *     {@link ./remote.DriverService remote.DriverService}
- *     that manages the
- *     [OperaDriver](https://github.com/operasoftware/operachromiumdriver)
- *     child process.
- *
- * 2. {@linkplain Options}: defines configuration options for each new Opera
- *     session, such as which {@linkplain Options#setProxy proxy} to use,
- *     what {@linkplain Options#addExtensions extensions} to install, or
- *     what {@linkplain Options#addArguments command-line switches} to use when
- *     starting the browser.Service
- *
- * 3. {@linkplain Driver}: the WebDriver client; each new instance will control
- *     a unique browser session with a clean user profile (unless otherwise
- *     configured through the {@link Options} class).
- *
- * By default, every Opera session will use a single driver service, which is
- * started the first time a {@link Driver} instance is created and terminated
- * when this process exits. The default service will inherit its environment
- * from the current process and direct all output to /dev/null. You may obtain
- * a handle to this default service using
- * {@link #getDefaultService getDefaultService()} and change its configuration
- * with {@link #setDefaultService setDefaultService()}.
- *
- * You may also create a {@link Driver} with its own driver service. This is
- * useful if you need to capture the server's log output for a specific session:
- *
- *     var opera = require('selenium-webdriver/opera');
- *
- *     var service = new opera.ServiceBuilder()
- *         .loggingTo('/my/log/file.txt')
- *         .enableVerboseLogging()
- *         .build();
- *
- *     var options = new opera.Options();
- *     // configure browser options ...
- *
- *     var driver = opera.Driver.createSession(options, service);
- *
- * Users should only instantiate the {@link Driver} class directly when they
- * need a custom driver service configuration (as shown above). For normal
- * operation, users should start Opera using the
- * {@link ./builder.Builder selenium-webdriver.Builder}.
- */
-
-'use strict'
-
-const http = require('./http'),
-  io = require('./io'),
-  capabilities = require('./lib/capabilities'),
-  Symbols = require('./lib/symbols'),
-  webdriver = require('./lib/webdriver'),
-  remote = require('./remote')
-
-/**
- * Name of the OperaDriver executable.
- * @type {string}
- * @const
- */
-const OPERADRIVER_EXE =
-  process.platform === 'win32' ? 'operadriver.exe' : 'operadriver'
-
-/**
- * _Synchronously_ attempts to locate the operadriver executable on the current
- * system.
- *
- * @return {?string} the located executable, or `null`.
- */
-function locateSynchronously() {
-  return io.findInPath(OPERADRIVER_EXE, true)
-}
-
-/**
- * Creates {@link remote.DriverService} instances that manages an
- * [OperaDriver](https://github.com/operasoftware/operachromiumdriver)
- * server in a child process.
- */
-class ServiceBuilder extends remote.DriverService.Builder {
-  /**
-   * @param {string=} opt_exe Path to the server executable to use. If omitted,
-   *     the builder will attempt to locate the operadriver on the current
-   *     PATH.
-   * @throws {Error} If provided executable does not exist, or the operadriver
-   *     cannot be found on the PATH.
-   */
-  constructor(opt_exe) {
-    let exe = opt_exe || locateSynchronously()
-    if (!exe) {
-      throw Error(
-        'The OperaDriver could not be found on the current PATH. Please ' +
-          'download the latest version of the OperaDriver from ' +
-          'https://github.com/operasoftware/operachromiumdriver/releases and ' +
-          'ensure it can be found on your PATH.'
-      )
-    }
-
-    super(exe)
-    this.setLoopback(true)
-  }
-
-  /**
-   * Sets the path of the log file the driver should log to. If a log file is
-   * not specified, the driver will log to stderr.
-   * @param {string} path Path of the log file to use.
-   * @return {!ServiceBuilder} A self reference.
-   */
-  loggingTo(path) {
-    return this.addArguments('--log-path=' + path)
-  }
-
-  /**
-   * Enables verbose logging.
-   * @return {!ServiceBuilder} A self reference.
-   */
-  enableVerboseLogging() {
-    return this.addArguments('--verbose')
-  }
-
-  /**
-   * Silence sthe drivers output.
-   * @return {!ServiceBuilder} A self reference.
-   */
-  silent() {
-    return this.addArguments('--silent')
-  }
-}
-
-/** @type {remote.DriverService} */
-var defaultService = null
-
-/**
- * Sets the default service to use for new OperaDriver instances.
- * @param {!remote.DriverService} service The service to use.
- * @throws {Error} If the default service is currently running.
- */
-function setDefaultService(service) {
-  if (defaultService && defaultService.isRunning()) {
-    throw Error(
-      'The previously configured OperaDriver service is still running. ' +
-        'You must shut it down before you may adjust its configuration.'
-    )
-  }
-  defaultService = service
-}
-
-/**
- * Returns the default OperaDriver service. If such a service has not been
- * configured, one will be constructed using the default configuration for
- * a OperaDriver executable found on the system PATH.
- * @return {!remote.DriverService} The default OperaDriver service.
- */
-function getDefaultService() {
-  if (!defaultService) {
-    defaultService = new ServiceBuilder().build()
-  }
-  return defaultService
-}
-
-/**
- * @type {string}
- * @const
- */
-var OPTIONS_CAPABILITY_KEY = 'chromeOptions'
-
-/**
- * Class for managing {@linkplain Driver OperaDriver} specific options.
- */
-class Options {
-  constructor() {
-    /** @private {!Array.<string>} */
-    this.args_ = []
-
-    /** @private {?string} */
-    this.binary_ = null
-
-    /** @private {!Array.<(string|!Buffer)>} */
-    this.extensions_ = []
-
-    /** @private {./lib/logging.Preferences} */
-    this.logPrefs_ = null
-
-    /** @private {?capabilities.ProxyConfig} */
-    this.proxy_ = null
-  }
-
-  /**
-   * Extracts the OperaDriver specific options from the given capabilities
-   * object.
-   * @param {!capabilities.Capabilities} caps The capabilities object.
-   * @return {!Options} The OperaDriver options.
-   */
-  static fromCapabilities(caps) {
-    var options
-    var o = caps.get(OPTIONS_CAPABILITY_KEY)
-    if (o instanceof Options) {
-      options = o
-    } else if (o) {
-      options = new Options()
-        .addArguments(o.args || [])
-        .addExtensions(o.extensions || [])
-        .setOperaBinaryPath(o.binary)
-    } else {
-      options = new Options()
-    }
-
-    if (caps.has(capabilities.Capability.PROXY)) {
-      options.setProxy(caps.get(capabilities.Capability.PROXY))
-    }
-
-    if (caps.has(capabilities.Capability.LOGGING_PREFS)) {
-      options.setLoggingPrefs(caps.get(capabilities.Capability.LOGGING_PREFS))
-    }
-
-    return options
-  }
-
-  /**
-   * Add additional command line arguments to use when launching the Opera
-   * browser.  Each argument may be specified with or without the "--" prefix
-   * (e.g. "--foo" and "foo"). Arguments with an associated value should be
-   * delimited by an "=": "foo=bar".
-   * @param {...(string|!Array.<string>)} var_args The arguments to add.
-   * @return {!Options} A self reference.
-   */
-  addArguments(var_args) { // eslint-disable-line
-    this.args_ = this.args_.concat.apply(this.args_, arguments)
-    return this
-  }
-
-  /**
-   * Add additional extensions to install when launching Opera. Each extension
-   * should be specified as the path to the packed CRX file, or a Buffer for an
-   * extension.
-   * @param {...(string|!Buffer|!Array.<(string|!Buffer)>)} var_args The
-   *     extensions to add.
-   * @return {!Options} A self reference.
-   */
-  addExtensions(var_args) { // eslint-disable-line
-    this.extensions_ = this.extensions_.concat.apply(
-      this.extensions_,
-      arguments
-    )
-    return this
-  }
-
-  /**
-   * Sets the path to the Opera binary to use. On Mac OS X, this path should
-   * reference the actual Opera executable, not just the application binary. The
-   * binary path be absolute or relative to the operadriver server executable, but
-   * it must exist on the machine that will launch Opera.
-   *
-   * @param {string} path The path to the Opera binary to use.
-   * @return {!Options} A self reference.
-   */
-  setOperaBinaryPath(path) {
-    this.binary_ = path
-    return this
-  }
-
-  /**
-   * Sets the logging preferences for the new session.
-   * @param {!./lib/logging.Preferences} prefs The logging preferences.
-   * @return {!Options} A self reference.
-   */
-  setLoggingPrefs(prefs) {
-    this.logPrefs_ = prefs
-    return this
-  }
-
-  /**
-   * Sets the proxy settings for the new session.
-   * @param {capabilities.ProxyConfig} proxy The proxy configuration to use.
-   * @return {!Options} A self reference.
-   */
-  setProxy(proxy) {
-    this.proxy_ = proxy
-    return this
-  }
-
-  /**
-   * Converts this options instance to a {@link capabilities.Capabilities}
-   *     object.
-   * @param {capabilities.Capabilities=} opt_capabilities The capabilities to
-   *     merge these options into, if any.
-   * @return {!capabilities.Capabilities} The capabilities.
-   */
-  toCapabilities(opt_capabilities) {
-    var caps = opt_capabilities || capabilities.Capabilities.opera()
-    caps
-      .set(capabilities.Capability.PROXY, this.proxy_)
-      .set(capabilities.Capability.LOGGING_PREFS, this.logPrefs_)
-      .set(OPTIONS_CAPABILITY_KEY, this)
-    return caps
-  }
-
-  /**
-   * Converts this instance to its JSON wire protocol representation. Note this
-   * function is an implementation not intended for general use.
-   * @return {!Object} The JSON wire protocol representation of this instance.
-   */
-  [Symbols.serialize]() {
-    var json = {
-      args: this.args_,
-      extensions: this.extensions_.map(function (extension) {
-        if (Buffer.isBuffer(extension)) {
-          return extension.toString('base64')
-        }
-        return io
-          .read(/** @type {string} */ (extension))
-          .then((buffer) => buffer.toString('base64'))
-      }),
-    }
-    if (this.binary_) {
-      json.binary = this.binary_
-    }
-    return json
-  }
-}
-
-/**
- * Creates a new WebDriver client for Opera.
- */
-class Driver extends webdriver.WebDriver {
-  /**
-   * Creates a new session for Opera.
-   *
-   * @param {(Capabilities|Options)=} opt_config The configuration
-   *     options.
-   * @param {remote.DriverService=} opt_service The session to use; will use
-   *     the {@link getDefaultService default service} by default.
-   * @return {!Driver} A new driver instance.
-   */
-  static createSession(opt_config, opt_service) {
-    var service = opt_service || getDefaultService()
-    var client = service.start().then((url) => new http.HttpClient(url))
-    var executor = new http.Executor(client)
-
-    var caps =
-      opt_config instanceof Options
-        ? opt_config.toCapabilities()
-        : opt_config || capabilities.Capabilities.opera()
-
-    // On Linux, the OperaDriver does not look for Opera on the PATH, so we
-    // must explicitly find it. See: operachromiumdriver #9.
-    if (process.platform === 'linux') {
-      var options = Options.fromCapabilities(caps)
-      if (!options.binary_) {
-        let exe = io.findInPath('opera', true)
-        if (!exe) {
-          throw Error(
-            'The opera executable could not be found on the current PATH'
-          )
-        }
-        options.setOperaBinaryPath(exe)
-      }
-      caps = options.toCapabilities(caps)
-    }
-
-    return /** @type {!Driver} */ (
-      super.createSession(executor, caps, () => service.kill())
-    )
-  }
-
-  /**
-   * This function is a no-op as file detectors are not supported by this
-   * implementation.
-   * @override
-   */
-  setFileDetector() {}
-}
-
-// PUBLIC API
-
-exports.Driver = Driver
-exports.Options = Options
-exports.ServiceBuilder = ServiceBuilder
-exports.getDefaultService = getDefaultService
-exports.setDefaultService = setDefaultService
-exports.locateSynchronously = locateSynchronously