selenium-webdriver 4.1.0 → 4.1.1

package/lib/http.js

@@ -31,7 +31,7 @@ const error = require('./error')
 const logging = require('./logging')
 const promise = require('./promise')
 const { Session } = require('./session')
-const { WebElement, ShadowRoot } = require('./webdriver')
+const { WebElement } = require('./webdriver')
 
 const getAttribute = requireAtom(
   'get-attribute.js',
@@ -173,12 +173,13 @@ var CommandSpec // eslint-disable-line
 /** @typedef {function(!cmd.Command): !cmd.Command} */
 var CommandTransformer // eslint-disable-line
 
-class InternalTypeError extends TypeError { }
+class InternalTypeError extends TypeError {}
 
 /**
  * @param {!cmd.Command} command The initial command.
  * @param {Atom} atom The name of the atom to execute.
- * @return {!cmd.Command} The transformed command to execute.
+ * @param params
+ * @return {!Command} The transformed command to execute.
  */
 function toExecuteAtomCommand(command, atom, ...params) {
   if (typeof atom !== 'function') {
@@ -194,143 +195,39 @@ function toExecuteAtomCommand(command, atom, ...params) {
     )
 }
 
-/** @const {!Map<string, CommandSpec>} */
-const COMMAND_MAP = new Map([
-  [cmd.Name.GET_SERVER_STATUS, get('/status')],
-  [cmd.Name.NEW_SESSION, post('/session')],
-  [cmd.Name.GET_SESSIONS, get('/sessions')],
-  [cmd.Name.QUIT, del('/session/:sessionId')],
-  [cmd.Name.CLOSE, del('/session/:sessionId/window')],
-  [
-    cmd.Name.GET_CURRENT_WINDOW_HANDLE,
-    get('/session/:sessionId/window_handle'),
-  ],
-  [cmd.Name.GET_WINDOW_HANDLES, get('/session/:sessionId/window_handles')],
-  [cmd.Name.GET_CURRENT_URL, get('/session/:sessionId/url')],
-  [cmd.Name.GET, post('/session/:sessionId/url')],
-  [cmd.Name.GO_BACK, post('/session/:sessionId/back')],
-  [cmd.Name.GO_FORWARD, post('/session/:sessionId/forward')],
-  [cmd.Name.REFRESH, post('/session/:sessionId/refresh')],
-  [cmd.Name.ADD_COOKIE, post('/session/:sessionId/cookie')],
-  [cmd.Name.GET_ALL_COOKIES, get('/session/:sessionId/cookie')],
-  [cmd.Name.DELETE_ALL_COOKIES, del('/session/:sessionId/cookie')],
-  [cmd.Name.DELETE_COOKIE, del('/session/:sessionId/cookie/:name')],
-  [cmd.Name.FIND_ELEMENT, post('/session/:sessionId/element')],
-  [cmd.Name.FIND_ELEMENTS, post('/session/:sessionId/elements')],
-  [cmd.Name.GET_ACTIVE_ELEMENT, post('/session/:sessionId/element/active')],
-  [
-    cmd.Name.FIND_CHILD_ELEMENT,
-    post('/session/:sessionId/element/:id/element'),
-  ],
-  [
-    cmd.Name.FIND_CHILD_ELEMENTS,
-    post('/session/:sessionId/element/:id/elements'),
-  ],
-  [cmd.Name.CLEAR_ELEMENT, post('/session/:sessionId/element/:id/clear')],
-  [cmd.Name.CLICK_ELEMENT, post('/session/:sessionId/element/:id/click')],
-  [
-    cmd.Name.SEND_KEYS_TO_ELEMENT,
-    post('/session/:sessionId/element/:id/value'),
-  ],
-  [cmd.Name.SUBMIT_ELEMENT, post('/session/:sessionId/element/:id/submit')],
-  [cmd.Name.GET_ELEMENT_TEXT, get('/session/:sessionId/element/:id/text')],
-  [
-    cmd.Name.GET_COMPUTED_ROLE,
-    get('/session/:sessionId/element/:id/computedrole'),
-  ],
-  [
-    cmd.Name.GET_COMPUTED_LABEL,
-    get('/session/:sessionId/element/:id/computedlabel'),
-  ],
-  [cmd.Name.GET_ELEMENT_TAG_NAME, get('/session/:sessionId/element/:id/name')],
-  [
-    cmd.Name.IS_ELEMENT_SELECTED,
-    get('/session/:sessionId/element/:id/selected'),
-  ],
-  [cmd.Name.IS_ELEMENT_ENABLED, get('/session/:sessionId/element/:id/enabled')],
-  [
-    cmd.Name.IS_ELEMENT_DISPLAYED,
-    get('/session/:sessionId/element/:id/displayed'),
-  ],
-  [
-    cmd.Name.GET_ELEMENT_LOCATION,
-    get('/session/:sessionId/element/:id/location'),
-  ],
-  [cmd.Name.GET_ELEMENT_SIZE, get('/session/:sessionId/element/:id/size')],
-  [
-    cmd.Name.GET_ELEMENT_ATTRIBUTE,
-    get('/session/:sessionId/element/:id/attribute/:name'),
-  ],
-  [
-    cmd.Name.GET_ELEMENT_PROPERTY,
-    get('/session/:sessionId/element/:id/property/:name'),
-  ],
-  [
-    cmd.Name.GET_ELEMENT_VALUE_OF_CSS_PROPERTY,
-    get('/session/:sessionId/element/:id/css/:propertyName'),
-  ],
-  [
-    cmd.Name.TAKE_ELEMENT_SCREENSHOT,
-    get('/session/:sessionId/element/:id/screenshot'),
-  ],
-  [cmd.Name.SWITCH_TO_WINDOW, post('/session/:sessionId/window')],
-  [
-    cmd.Name.MAXIMIZE_WINDOW,
-    post('/session/:sessionId/window/current/maximize'),
-  ],
-  [
-    cmd.Name.GET_WINDOW_POSITION,
-    get('/session/:sessionId/window/current/position'),
-  ],
-  [
-    cmd.Name.SET_WINDOW_POSITION,
-    post('/session/:sessionId/window/current/position'),
-  ],
-  [cmd.Name.GET_WINDOW_SIZE, get('/session/:sessionId/window/current/size')],
-  [cmd.Name.SET_WINDOW_SIZE, post('/session/:sessionId/window/current/size')],
-  [cmd.Name.SWITCH_TO_FRAME, post('/session/:sessionId/frame')],
-  [cmd.Name.SWITCH_TO_FRAME_PARENT, post('/session/:sessionId/frame/parent')],
-  [cmd.Name.GET_PAGE_SOURCE, get('/session/:sessionId/source')],
-  [cmd.Name.GET_TITLE, get('/session/:sessionId/title')],
-  [cmd.Name.EXECUTE_SCRIPT, post('/session/:sessionId/execute')],
-  [cmd.Name.EXECUTE_ASYNC_SCRIPT, post('/session/:sessionId/execute_async')],
-  [cmd.Name.SCREENSHOT, get('/session/:sessionId/screenshot')],
-  [cmd.Name.GET_TIMEOUT, get('/session/:sessionId/timeouts')],
-  [cmd.Name.SET_TIMEOUT, post('/session/:sessionId/timeouts')],
-  [cmd.Name.ACCEPT_ALERT, post('/session/:sessionId/accept_alert')],
-  [cmd.Name.DISMISS_ALERT, post('/session/:sessionId/dismiss_alert')],
-  [cmd.Name.GET_ALERT_TEXT, get('/session/:sessionId/alert_text')],
-  [cmd.Name.SET_ALERT_TEXT, post('/session/:sessionId/alert_text')],
-  [cmd.Name.GET_LOG, post('/session/:sessionId/log')],
-  [cmd.Name.GET_AVAILABLE_LOG_TYPES, get('/session/:sessionId/log/types')],
-  [cmd.Name.GET_SESSION_LOGS, post('/logs')],
-  [cmd.Name.UPLOAD_FILE, post('/session/:sessionId/se/file')],
-])
-
 /** @const {!Map<string, (CommandSpec|CommandTransformer)>} */
 const W3C_COMMAND_MAP = new Map([
-  // Server status.
-  [cmd.Name.GET_SERVER_STATUS, get('/status')],
+
   // Session management.
   [cmd.Name.NEW_SESSION, post('/session')],
   [cmd.Name.QUIT, del('/session/:sessionId')],
+
+  // Server status.
+  [cmd.Name.GET_SERVER_STATUS, get('/status')],
+
+  // timeouts
   [cmd.Name.GET_TIMEOUT, get('/session/:sessionId/timeouts')],
   [cmd.Name.SET_TIMEOUT, post('/session/:sessionId/timeouts')],
+
   // Navigation.
   [cmd.Name.GET_CURRENT_URL, get('/session/:sessionId/url')],
   [cmd.Name.GET, post('/session/:sessionId/url')],
   [cmd.Name.GO_BACK, post('/session/:sessionId/back')],
   [cmd.Name.GO_FORWARD, post('/session/:sessionId/forward')],
   [cmd.Name.REFRESH, post('/session/:sessionId/refresh')],
+
   // Page inspection.
   [cmd.Name.GET_PAGE_SOURCE, get('/session/:sessionId/source')],
   [cmd.Name.GET_TITLE, get('/session/:sessionId/title')],
+
   // Script execution.
   [cmd.Name.EXECUTE_SCRIPT, post('/session/:sessionId/execute/sync')],
   [cmd.Name.EXECUTE_ASYNC_SCRIPT, post('/session/:sessionId/execute/async')],
+
   // Frame selection.
   [cmd.Name.SWITCH_TO_FRAME, post('/session/:sessionId/frame')],
   [cmd.Name.SWITCH_TO_FRAME_PARENT, post('/session/:sessionId/frame/parent')],
+
   // Window management.
   [cmd.Name.GET_CURRENT_WINDOW_HANDLE, get('/session/:sessionId/window')],
   [cmd.Name.CLOSE, del('/session/:sessionId/window')],
@@ -342,9 +239,13 @@ const W3C_COMMAND_MAP = new Map([
   [cmd.Name.MAXIMIZE_WINDOW, post('/session/:sessionId/window/maximize')],
   [cmd.Name.MINIMIZE_WINDOW, post('/session/:sessionId/window/minimize')],
   [cmd.Name.FULLSCREEN_WINDOW, post('/session/:sessionId/window/fullscreen')],
+
   // Actions.
   [cmd.Name.ACTIONS, post('/session/:sessionId/actions')],
   [cmd.Name.CLEAR_ACTIONS, del('/session/:sessionId/actions')],
+  [cmd.Name.PRINT_PAGE, post('/session/:sessionId/print')],
+
+
   // Locating elements.
   [cmd.Name.GET_ACTIVE_ELEMENT, get('/session/:sessionId/element/active')],
   [cmd.Name.FIND_ELEMENT, post('/session/:sessionId/element')],
@@ -365,6 +266,13 @@ const W3C_COMMAND_MAP = new Map([
   ],
   // Element interaction.
   [cmd.Name.GET_ELEMENT_TAG_NAME, get('/session/:sessionId/element/:id/name')],
+  [cmd.Name.GET_DOM_ATTRIBUTE, get('/session/:sessionId/element/:id/attribute/:name')],
+  [
+    cmd.Name.GET_ELEMENT_ATTRIBUTE,
+    (cmd) => {
+      return toExecuteAtomCommand(cmd, Atom.GET_ATTRIBUTE, 'id', 'name')
+    },
+  ],
   [
     cmd.Name.GET_ELEMENT_PROPERTY,
     get('/session/:sessionId/element/:id/property/:name'),
@@ -391,43 +299,53 @@ const W3C_COMMAND_MAP = new Map([
   ],
   [cmd.Name.IS_ELEMENT_ENABLED, get('/session/:sessionId/element/:id/enabled')],
   [
-    cmd.Name.GET_ELEMENT_ATTRIBUTE,
-    (cmd) => {
-      return toExecuteAtomCommand(cmd, Atom.GET_ATTRIBUTE, 'id', 'name')
-    },
+    cmd.Name.IS_ELEMENT_SELECTED,
+    get('/session/:sessionId/element/:id/selected'),
   ],
+
   [
     cmd.Name.IS_ELEMENT_DISPLAYED,
     (cmd) => {
       return toExecuteAtomCommand(cmd, Atom.IS_DISPLAYED, 'id')
     },
   ],
+
   // Cookie management.
   [cmd.Name.GET_ALL_COOKIES, get('/session/:sessionId/cookie')],
   [cmd.Name.ADD_COOKIE, post('/session/:sessionId/cookie')],
   [cmd.Name.DELETE_ALL_COOKIES, del('/session/:sessionId/cookie')],
   [cmd.Name.GET_COOKIE, get('/session/:sessionId/cookie/:name')],
   [cmd.Name.DELETE_COOKIE, del('/session/:sessionId/cookie/:name')],
+
   // Alert management.
   [cmd.Name.ACCEPT_ALERT, post('/session/:sessionId/alert/accept')],
   [cmd.Name.DISMISS_ALERT, post('/session/:sessionId/alert/dismiss')],
   [cmd.Name.GET_ALERT_TEXT, get('/session/:sessionId/alert/text')],
   [cmd.Name.SET_ALERT_TEXT, post('/session/:sessionId/alert/text')],
+
   // Screenshots.
   [cmd.Name.SCREENSHOT, get('/session/:sessionId/screenshot')],
   [
     cmd.Name.TAKE_ELEMENT_SCREENSHOT,
     get('/session/:sessionId/element/:id/screenshot'),
   ],
-  // print page.
-  [cmd.Name.PRINT_PAGE, post('/session/:sessionId/print')],
+
   // Shadow Root
   [cmd.Name.GET_SHADOW_ROOT, get('/session/:sessionId/element/:id/shadow')],
-  [cmd.Name.FIND_ELEMENT_FROM_SHADOWROOT, post('/session/:sessionId/shadow/:id/element')],
-  [cmd.Name.FIND_ELEMENTS_FROM_SHADOWROOT, post('/session/:sessionId/shadow/:id/elements')],
+  [
+    cmd.Name.FIND_ELEMENT_FROM_SHADOWROOT,
+    post('/session/:sessionId/shadow/:id/element'),
+  ],
+  [
+    cmd.Name.FIND_ELEMENTS_FROM_SHADOWROOT,
+    post('/session/:sessionId/shadow/:id/elements'),
+  ],
   // Log extensions.
   [cmd.Name.GET_LOG, post('/session/:sessionId/se/log')],
   [cmd.Name.GET_AVAILABLE_LOG_TYPES, get('/session/:sessionId/se/log/types')],
+
+  // Server Extensions
+  [cmd.Name.UPLOAD_FILE, post('/session/:sessionId/se/file')],
 ])
 
 /**
@@ -451,31 +369,23 @@ class Client {
 /**
  * @param {Map<string, CommandSpec>} customCommands
  *     A map of custom command definitions.
- * @param {boolean} w3c Whether to use W3C command mappings.
  * @param {!cmd.Command} command The command to resolve.
  * @return {!Request} A promise that will resolve with the
  *     command to execute.
  */
-function buildRequest(customCommands, w3c, command) {
+function buildRequest(customCommands, command) {
   LOG.finest(() => `Translating command: ${command.getName()}`)
   let spec = customCommands && customCommands.get(command.getName())
   if (spec) {
     return toHttpRequest(spec)
   }
 
-  if (w3c) {
-    spec = W3C_COMMAND_MAP.get(command.getName())
-    if (typeof spec === 'function') {
-      LOG.finest(() => `Transforming command for W3C: ${command.getName()}`)
-      let newCommand = spec(command)
-      return buildRequest(customCommands, w3c, newCommand)
-    } else if (spec) {
-      return toHttpRequest(spec)
-    }
-  }
-
-  spec = COMMAND_MAP.get(command.getName())
-  if (spec) {
+  spec = W3C_COMMAND_MAP.get(command.getName())
+  if (typeof spec === 'function') {
+    LOG.finest(() => `Transforming command for W3C: ${command.getName()}`)
+    let newCommand = spec(command)
+    return buildRequest(customCommands, newCommand)
+  } else if (spec) {
     return toHttpRequest(spec)
   }
   throw new error.UnknownCommandError(
@@ -519,15 +429,6 @@ class Executor {
   constructor(client) {
     CLIENTS.set(this, client)
 
-    /**
-     * Whether this executor should use the W3C wire protocol. The executor
-     * will automatically switch if the remote end sends a compliant response
-     * to a new session command, however, this property may be directly set to
-     * `true` to force the executor into W3C mode.
-     * @type {boolean}
-     */
-    this.w3c = false
-
     /** @private {Map<string, CommandSpec>} */
     this.customCommands_ = null
 
@@ -557,7 +458,7 @@ class Executor {
 
   /** @override */
   async execute(command) {
-    let request = buildRequest(this.customCommands_, this.w3c, command)
+    let request = buildRequest(this.customCommands_, command)
     this.log_.finer(() => `>>> ${request.method} ${request.path}`)
 
     let client = CLIENTS.get(this)
@@ -588,7 +489,7 @@ class Executor {
       // No implementations use the `capabilities` key yet...
       let capabilities = value.capabilities || value.value
       return new Session(
-        /** @type {{sessionId: string}} */(value).sessionId,
+        /** @type {{sessionId: string}} */ (value).sessionId,
         capabilities
       )
     }
@@ -658,7 +559,7 @@ function parseHttpResponse(command, httpResponse) {
 
   // 404 represents an unknown command; anything else > 399 is a generic unknown
   // error.
-  if (httpResponse.status == 404) {
+  if (httpResponse.status === 404) {
     throw new error.UnsupportedOperationError(command.getName() + ': ' + value)
   } else if (httpResponse.status >= 400) {
     throw new error.WebDriverError(value)
@@ -702,8 +603,11 @@ function buildPath(path, parameters) {
 
 // PUBLIC API
 
-exports.Executor = Executor
-exports.Client = Client
-exports.Request = Request
-exports.Response = Response
-exports.buildPath = buildPath // Exported for testing.
+module.exports = {
+  Executor: Executor,
+  Client: Client,
+  Request: Request,
+  Response: Response,
+  // Exported for testing.
+  buildPath: buildPath
+}

package/lib/input.js

@@ -250,7 +250,7 @@ function checkCodePoint(key) {
   }
 
   key = key.normalize()
-  if (Array.from(key).length != 1) {
+  if (Array.from(key).length !== 1) {
     throw new InvalidArgumentError(
       `key input is not a single code point: ${key}`
     )

package/lib/promise.js

@@ -142,14 +142,12 @@ async function map(array, fn, self = undefined) {
   }
 
   const arr = /** @type {!Array} */ (v)
-  const n = arr.length
-  const values = new Array(n)
+  const values = []
 
-  for (let i = 0; i < n; i++) {
-    if (i in arr) {
-      values[i] = await Promise.resolve(fn.call(self, arr[i], i, arr))
-    }
+  for (const [index, item] of arr.entries()) {
+    values.push(await Promise.resolve(fn.call(self, item, index, arr)))
   }
+
   return values
 }
 
@@ -181,19 +179,17 @@ async function filter(array, fn, self = undefined) {
   }
 
   const arr = /** @type {!Array} */ (v)
-  const n = arr.length
   const values = []
-  let valuesLength = 0
 
-  for (let i = 0; i < n; i++) {
-    if (i in arr) {
-      const value = arr[i]
-      const include = await fn.call(self, value, i, arr)
-      if (include) {
-        values[valuesLength++] = value
-      }
+  for (const [index, item] of arr.entries()) {
+    const isConditionTrue = await Promise.resolve(
+      fn.call(self, item, index, arr)
+    )
+    if (isConditionTrue) {
+      values.push(item)
     }
   }
+
   return values
 }
 
@@ -266,8 +262,7 @@ async function fullyResolveKeys(obj) {
     ) {
       return
     }
-    let resolvedValue = await fullyResolved(partialValue)
-    obj[key] = resolvedValue
+    obj[key] = await fullyResolved(partialValue)
   })
   return obj
 }

package/lib/proxy.js

@@ -130,7 +130,7 @@ ManualConfig.prototype.socksVersion
  * Configures WebDriver to bypass all browser proxies.
  * @return {!Config} A new proxy configuration object.
  */
-exports.direct = function () {
+function direct() {
   return { proxyType: Type.DIRECT }
 }
 
@@ -155,7 +155,7 @@ exports.direct = function () {
  *     configuration options.
  * @return {!ManualConfig} A new proxy configuration object.
  */
-exports.manual = function ({ ftp, http, https, bypass }) {
+function manual({ ftp, http, https, bypass }) {
   return {
     proxyType: Type.MANUAL,
     ftpProxy: ftp,
@@ -185,7 +185,7 @@ exports.manual = function ({ ftp, http, https, bypass }) {
  * @return {!ManualConfig} A new proxy configuration object.
  * @see https://en.wikipedia.org/wiki/SOCKS
  */
-exports.socks = function (socksProxy, socksVersion = undefined) {
+function socks(socksProxy, socksVersion = undefined) {
   return /** @type {!Config} */ ({
     proxyType: Type.MANUAL,
     socksProxy,
@@ -199,7 +199,7 @@ exports.socks = function (socksProxy, socksVersion = undefined) {
  * @param {string} proxyAutoconfigUrl URL for the PAC proxy to use.
  * @return {!PacConfig} A new proxy configuration object.
  */
-exports.pac = function (proxyAutoconfigUrl) {
+function pac(proxyAutoconfigUrl) {
   return { proxyType: Type.PAC, proxyAutoconfigUrl }
 }
 
@@ -207,6 +207,16 @@ exports.pac = function (proxyAutoconfigUrl) {
  * Configures WebDriver to use the current system's proxy.
  * @return {!Config} A new proxy configuration object.
  */
-exports.system = function () {
+function system() {
   return { proxyType: Type.SYSTEM }
 }
+
+// PUBLIC API
+
+module.exports = {
+  system,
+  pac,
+  socks,
+  manual,
+  direct,
+}

package/lib/session.js

@@ -74,4 +74,4 @@ class Session {
 
 // PUBLIC API
 
-module.exports = { Session: Session }
+module.exports = { Session }

package/lib/until.js

@@ -137,14 +137,13 @@ exports.alertIsPresent = function alertIsPresent() {
  * @return {!Condition<boolean>} The new condition.
  */
 exports.titleIs = function titleIs(title) {
-  return new Condition(
-    'for title to be ' + JSON.stringify(title),
-    function (driver) {
-      return driver.getTitle().then(function (t) {
-        return t === title
-      })
-    }
-  )
+  return new Condition('for title to be ' + JSON.stringify(title), function (
+    driver
+  ) {
+    return driver.getTitle().then(function (t) {
+      return t === title
+    })
+  })
 }
 
 /**
@@ -189,14 +188,13 @@ exports.titleMatches = function titleMatches(regex) {
  * @return {!Condition<boolean>} The new condition.
  */
 exports.urlIs = function urlIs(url) {
-  return new Condition(
-    'for URL to be ' + JSON.stringify(url),
-    function (driver) {
-      return driver.getCurrentUrl().then(function (u) {
-        return u === url
-      })
-    }
-  )
+  return new Condition('for URL to be ' + JSON.stringify(url), function (
+    driver
+  ) {
+    return driver.getCurrentUrl().then(function (u) {
+      return u === url
+    })
+  })
 }
 
 /**