selenium-webdriver 4.0.0-rc-1 → 4.1.1

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()
@@ -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

@@ -29,7 +29,7 @@ const net = require('net')
  */
 function isFree(port, opt_host) {
   return new Promise((resolve, reject) => {
-    let server = net.createServer().on('error', function (e) {
+    const server = net.createServer().on('error', function (e) {
       if (e.code === 'EADDRINUSE' || e.code === 'EACCES') {
         resolve(false)
       } else {
@@ -70,6 +70,7 @@ function findFreePort(opt_host) {
 }
 
 // PUBLIC API
-
-exports.findFreePort = findFreePort
-exports.isFree = isFree
+module.exports = {
+  findFreePort,
+  isFree,
+}

package/opera.js

@@ -72,12 +72,12 @@
 
 'use strict'
 
-const http = require('./http'),
-  io = require('./io'),
-  capabilities = require('./lib/capabilities'),
-  Symbols = require('./lib/symbols'),
-  webdriver = require('./lib/webdriver'),
-  remote = require('./remote')
+const http = require('./http')
+const io = require('./io')
+const capabilities = require('./lib/capabilities')
+const Symbols = require('./lib/symbols')
+const webdriver = require('./lib/webdriver')
+const remote = require('./remote')
 
 /**
  * Name of the OperaDriver executable.
@@ -153,7 +153,7 @@ class ServiceBuilder extends remote.DriverService.Builder {
 }
 
 /** @type {remote.DriverService} */
-var defaultService = null
+let defaultService = null
 
 /**
  * Sets the default service to use for new OperaDriver instances.
@@ -187,7 +187,7 @@ function getDefaultService() {
  * @type {string}
  * @const
  */
-var OPTIONS_CAPABILITY_KEY = 'chromeOptions'
+const OPTIONS_CAPABILITY_KEY = 'chromeOptions'
 
 /**
  * Class for managing {@linkplain Driver OperaDriver} specific options.
@@ -217,8 +217,8 @@ class Options {
    * @return {!Options} The OperaDriver options.
    */
   static fromCapabilities(caps) {
-    var options
-    var o = caps.get(OPTIONS_CAPABILITY_KEY)
+    let options
+    const o = caps.get(OPTIONS_CAPABILITY_KEY)
     if (o instanceof Options) {
       options = o
     } else if (o) {
@@ -249,8 +249,8 @@ class Options {
    * @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)
+  addArguments(...var_args) {
+    this.args_ = this.args_.concat.apply(this.args_, var_args)
     return this
   }
 
@@ -262,11 +262,8 @@ class Options {
    *     extensions to add.
    * @return {!Options} A self reference.
    */
-  addExtensions(var_args) { // eslint-disable-line
-    this.extensions_ = this.extensions_.concat.apply(
-      this.extensions_,
-      arguments
-    )
+  addExtensions(...var_args) {
+    this.extensions_ = this.extensions_.concat.apply(this.extensions_, var_args)
     return this
   }
 
@@ -358,11 +355,11 @@ class Driver extends webdriver.WebDriver {
    * @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)
+    const service = opt_service || getDefaultService()
+    const client = service.start().then((url) => new http.HttpClient(url))
+    const executor = new http.Executor(client)
 
-    var caps =
+    let caps =
       opt_config instanceof Options
         ? opt_config.toCapabilities()
         : opt_config || capabilities.Capabilities.opera()
@@ -370,7 +367,7 @@ class Driver extends webdriver.WebDriver {
     // 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)
+      const options = Options.fromCapabilities(caps)
       if (!options.binary_) {
         let exe = io.findInPath('opera', true)
         if (!exe) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "selenium-webdriver",
-  "version": "4.0.0-rc-1",
+  "version": "4.1.1",
   "description": "The official WebDriver JavaScript bindings from the Selenium project",
   "license": "Apache-2.0",
   "keywords": [
@@ -24,7 +24,6 @@
   },
   "dependencies": {
     "jszip": "^3.6.0",
-    "rimraf": "^3.0.2",
     "tmp": "^0.2.1",
     "ws": ">=7.4.6"
   },

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))
@@ -464,7 +464,7 @@ class SeleniumServer extends DriverService {
       throw Error('Path to the Selenium jar not specified')
     }
 
-    var options = opt_options || {}
+    const options = opt_options || {}
 
     if (options.port < 0) {
       throw Error('Port must be >= 0: ' + options.port)
@@ -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/testing/index.js

@@ -40,7 +40,7 @@ const ie = require('../ie')
 const remote = require('../remote')
 const safari = require('../safari')
 const opera = require('../opera')
-const { Browser } = require('../lib/capabilities')
+const { Browser, Capabilities } = require('../lib/capabilities')
 const { Builder } = require('../index')
 
 /**
@@ -89,7 +89,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']
@@ -236,8 +236,7 @@ function init(force = false) {
 }
 
 const TARGET_MAP = /** !WeakMap<!Environment, !TargetBrowser> */ new WeakMap()
-const URL_MAP =
-  /** !WeakMap<!Environment, ?(string|remote.SeleniumServer)> */ new WeakMap()
+const URL_MAP = /** !WeakMap<!Environment, ?(string|remote.SeleniumServer)> */ new WeakMap()
 
 /**
  * Defines the environment a {@linkplain suite test suite} is running against.
@@ -250,9 +249,9 @@ class Environment {
    *     Selenium server to test against.
    */
   constructor(browser, url = undefined) {
-    browser = /** @type {!TargetBrowser} */ (
-      Object.seal(Object.assign({}, browser))
-    )
+    browser = /** @type {!TargetBrowser} */ (Object.seal(
+      Object.assign({}, browser)
+    ))
 
     TARGET_MAP.set(this, browser)
     URL_MAP.set(this, url || null)
@@ -273,7 +272,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
   }
 
   /**
@@ -287,12 +286,19 @@ class Environment {
     const builder = new Builder()
     builder.disableEnvironmentOverrides()
 
+
+
     const realBuild = builder.build
     builder.build = function () {
-      builder.forBrowser(browser.name, browser.version, browser.platform)
+      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') {