selenium-webdriver 4.0.0-alpha.4 → 4.0.0-alpha.8

package/lib/webdriver.js

@@ -19,32 +19,31 @@
  * @fileoverview The heart of the WebDriver JavaScript API.
  */
 
-'use strict';
-
-const by = require('./by');
-const command = require('./command');
-const error = require('./error');
-const input = require('./input');
-const logging = require('./logging');
-const promise = require('./promise');
-const Symbols = require('./symbols');
-const {Capabilities} = require('./capabilities');
-const {Session} = require('./session');
-
+'use strict'
+
+const by = require('./by')
+const { RelativeBy } = require('./by')
+const command = require('./command')
+const error = require('./error')
+const input = require('./input')
+const logging = require('./logging')
+const promise = require('./promise')
+const Symbols = require('./symbols')
+const { Capabilities } = require('./capabilities')
 
 // Capability names that are defined in the W3C spec.
 const W3C_CAPABILITY_NAMES = new Set([
-    'acceptInsecureCerts',
-    'browserName',
-    'browserVersion',
-    'platformName',
-    'pageLoadStrategy',
-    'proxy',
-    'setWindowRect',
-    'timeouts',
-    'unhandledPromptBehavior',
-]);
-
+  'acceptInsecureCerts',
+  'browserName',
+  'browserVersion',
+  'platformName',
+  'pageLoadStrategy',
+  'proxy',
+  'setWindowRect',
+  'timeouts',
+  'strictFileInteractability',
+  'unhandledPromptBehavior',
+])
 
 /**
  * Defines a condition for use with WebDriver's {@linkplain WebDriver#wait wait
@@ -61,19 +60,18 @@ class Condition {
    */
   constructor(message, fn) {
     /** @private {string} */
-    this.description_ = 'Waiting ' + message;
+    this.description_ = 'Waiting ' + message
 
     /** @type {function(!WebDriver): OUT} */
-    this.fn = fn;
+    this.fn = fn
   }
 
   /** @return {string} A description of this condition. */
   description() {
-    return this.description_;
+    return this.description_
   }
 }
 
-
 /**
  * Defines a condition that will result in a {@link WebElement}.
  *
@@ -88,18 +86,16 @@ class WebElementCondition extends Condition {
    *     loop.
    */
   constructor(message, fn) {
-    super(message, fn);
+    super(message, fn)
   }
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 //
 //  WebDriver
 //
 //////////////////////////////////////////////////////////////////////////////
 
-
 /**
  * Translates a command to its wire-protocol representation before passing it
  * to the given `executor` for execution.
@@ -108,14 +104,12 @@ class WebElementCondition extends Condition {
  * @return {!Promise} A promise that will resolve with the command response.
  */
 function executeCommand(executor, command) {
-  return toWireValue(command.getParameters()).
-      then(function(parameters) {
-        command.setParameters(parameters);
-        return executor.execute(command);
-      });
+  return toWireValue(command.getParameters()).then(function (parameters) {
+    command.setParameters(parameters)
+    return executor.execute(command)
+  })
 }
 
-
 /**
  * Converts an object to its JSON representation in the WebDriver wire protocol.
  * When converting values of type object, the following steps will be taken:
@@ -135,64 +129,62 @@ function executeCommand(executor, command) {
  *     representation.
  */
 async function toWireValue(obj) {
-  let value = await Promise.resolve(obj);
+  let value = await Promise.resolve(obj)
   if (value === void 0 || value === null) {
-    return value;
+    return value
   }
 
-  if (typeof value === 'boolean'
-      || typeof value === 'number'
-      || typeof value === 'string') {
-    return value;
+  if (
+    typeof value === 'boolean' ||
+    typeof value === 'number' ||
+    typeof value === 'string'
+  ) {
+    return value
   }
 
   if (Array.isArray(value)) {
-    return convertKeys(value);
+    return convertKeys(value)
   }
 
   if (typeof value === 'function') {
-    return '' + value;
+    return '' + value
   }
 
   if (typeof value[Symbols.serialize] === 'function') {
-    return toWireValue(value[Symbols.serialize]());
+    return toWireValue(value[Symbols.serialize]())
   } else if (typeof value.toJSON === 'function') {
-    return toWireValue(value.toJSON());
+    return toWireValue(value.toJSON())
   }
-  return convertKeys(value);
+  return convertKeys(value)
 }
 
-
 async function convertKeys(obj) {
-  const isArray = Array.isArray(obj);
-  const numKeys = isArray ? obj.length : Object.keys(obj).length;
-  const ret = isArray ? new Array(numKeys) : {};
+  const isArray = Array.isArray(obj)
+  const numKeys = isArray ? obj.length : Object.keys(obj).length
+  const ret = isArray ? new Array(numKeys) : {}
   if (!numKeys) {
-    return ret;
+    return ret
   }
 
-  let numResolved = 0;
-
   async function forEachKey(obj, fn) {
     if (Array.isArray(obj)) {
       for (let i = 0, n = obj.length; i < n; i++) {
-        await fn(obj[i], i);
+        await fn(obj[i], i)
       }
     } else {
       for (let key in obj) {
-        await fn(obj[key], key);
+        await fn(obj[key], key)
       }
     }
   }
 
-  await forEachKey(obj, async function(value, key) {
-    ret[key] = await toWireValue(value);
-  });
+  await forEachKey(obj, async function (value, key) {
+    ret[key] = await toWireValue(value)
+  })
 
-  return ret;
+  return ret
 }
 
-
 /**
  * Converts a value from its JSON representation according to the WebDriver wire
  * protocol. Any JSON object that defines a WebElement ID will be decoded to a
@@ -205,22 +197,32 @@ async function convertKeys(obj) {
  */
 function fromWireValue(driver, value) {
   if (Array.isArray(value)) {
-    value = value.map(v => fromWireValue(driver, v));
+    value = value.map((v) => fromWireValue(driver, v))
   } else if (WebElement.isId(value)) {
-    let id = WebElement.extractId(value);
-    value = new WebElement(driver, id);
+    let id = WebElement.extractId(value)
+    value = new WebElement(driver, id)
   } else if (value && typeof value === 'object') {
-    let result = {};
+    let result = {}
     for (let key in value) {
-      if (value.hasOwnProperty(key)) {
-        result[key] = fromWireValue(driver, value[key]);
+      if (Object.prototype.hasOwnProperty.call(value, key)) {
+        result[key] = fromWireValue(driver, value[key])
       }
     }
-    value = result;
+    value = result
   }
-  return value;
+  return value
 }
 
+/**
+ * Resolves a wait message from either a function or a string.
+ * @param {(string|Function)=} message An optional message to use if the wait times out.
+ * @return {string} The resolved message
+ */
+function resolveWaitMessage(message) {
+  return message
+    ? `${typeof message === 'function' ? message() : message}\n`
+    : ''
+}
 
 /**
  * Structural interface for a WebDriver client.
@@ -228,7 +230,6 @@ function fromWireValue(driver, value) {
  * @record
  */
 class IWebDriver {
-
   /**
    * Executes the provided {@link command.Command} using this driver's
    * {@link command.Executor}.
@@ -238,14 +239,14 @@ class IWebDriver {
    *     result.
    * @template T
    */
-  execute(command) {}
+  execute(command) {} // eslint-disable-line
 
   /**
    * Sets the {@linkplain input.FileDetector file detector} that should be
    * used with this instance.
    * @param {input.FileDetector} detector The detector to use or `null`.
    */
-  setFileDetector(detector) {}
+  setFileDetector(detector) {} // eslint-disable-line
 
   /**
    * @return {!command.Executor} The command executor used by this instance.
@@ -284,7 +285,7 @@ class IWebDriver {
    *     for details).
    * @return {!input.Actions} A new action sequence for this instance.
    */
-  actions(options) {}
+  actions(options) {} // eslint-disable-line
 
   /**
    * Executes a snippet of JavaScript in the context of the currently selected
@@ -322,7 +323,7 @@ class IWebDriver {
    *    scripts return value.
    * @template T
    */
-  executeScript(script, ...args) {}
+  executeScript(script, ...args) {} // eslint-disable-line
 
   /**
    * Executes a snippet of asynchronous JavaScript in the context of the
@@ -399,7 +400,7 @@ class IWebDriver {
    *     value.
    * @template T
    */
-  executeAsyncScript(script, ...args) {}
+  executeAsyncScript(script, ...args) {} // eslint-disable-line
 
   /**
    * Waits for a condition to evaluate to a "truthy" value. The condition may be
@@ -434,7 +435,7 @@ class IWebDriver {
    *     evaluate as a condition.
    * @param {number=} timeout The duration in milliseconds, how long to wait
    *     for the condition to be true.
-   * @param {string=} message An optional message to use if the wait times out.
+   * @param {(string|Function)=} message An optional message to use if the wait times out.
    * @param {number=} pollTimeout The duration in milliseconds, how long to
    *     wait between polling the condition.
    * @return {!(IThenable<T>|WebElementPromise)} A promise that will be
@@ -445,7 +446,12 @@ class IWebDriver {
    * @throws {TypeError} if the provided `condition` is not a valid type.
    * @template T
    */
-  wait(condition, timeout = undefined, message = undefined, pollTimeout = undefined) {}
+  wait(
+    condition, // eslint-disable-line
+    timeout = undefined, // eslint-disable-line
+    message = undefined, // eslint-disable-line
+    pollTimeout = undefined // eslint-disable-line
+  ) {}
 
   /**
    * Makes the driver sleep for the given amount of time.
@@ -454,7 +460,7 @@ class IWebDriver {
    * @return {!Promise<void>} A promise that will be resolved when the sleep has
    *     finished.
    */
-  sleep(ms) {}
+  sleep(ms) {} // eslint-disable-line
 
   /**
    * Retrieves the current window handle.
@@ -473,7 +479,7 @@ class IWebDriver {
   getAllWindowHandles() {}
 
   /**
-   * Retrieves the current page's source. The returned souce is a representation
+   * Retrieves the current page's source. The returned source is a representation
    * of the underlying DOM: do not expect it to be formatted or escaped in the
    * same way as the raw response sent from the web server.
    *
@@ -497,7 +503,7 @@ class IWebDriver {
    * @return {!Promise<void>} A promise that will be resolved when the document
    *     has finished loading.
    */
-  get(url) {}
+  get(url) {} // eslint-disable-line
 
   /**
    * Retrieves the URL for the current page.
@@ -517,7 +523,7 @@ class IWebDriver {
 
   /**
    * Locates an element on the page. If the element cannot be found, a
-   * {@link error.NoSuchEementError} will be returned by the driver.
+   * {@link error.NoSuchElementError} will be returned by the driver.
    *
    * This function should not be used to test whether an element is present on
    * the page. Rather, you should use {@link #findElements}:
@@ -553,7 +559,7 @@ class IWebDriver {
    *     commands against the located element. If the element is not found, the
    *     element will be invalidated and all scheduled commands aborted.
    */
-  findElement(locator) {}
+  findElement(locator) {} // eslint-disable-line
 
   /**
    * Search for multiple elements on the page. Refer to the documentation on
@@ -563,7 +569,7 @@ class IWebDriver {
    * @return {!Promise<!Array<!WebElement>>} A promise that will resolve to an
    *     array of WebElements.
    */
-  findElements(locator) {}
+  findElements(locator) {} // eslint-disable-line
 
   /**
    * Takes a screenshot of the current page. The driver makes a best effort to
@@ -594,8 +600,26 @@ class IWebDriver {
    *     instance.
    */
   switchTo() {}
-}
 
+  /**
+   *
+   * Takes a PDF of the current page. The driver makes a best effort to
+   * return a PDF based on the provided parameters.
+   *
+   * @param {{orientation: (string|undefined),
+   *         scale: (number|undefined),
+   *         background: (boolean|undefined)
+   *         width: (number|undefined)
+   *         height: (number|undefined)
+   *         top: (number|undefined)
+   *         bottom: (number|undefined)
+   *         left: (number|undefined)
+   *         right: (number|undefined)
+   *         shrinkToFit: (boolean|undefined)
+   *         pageRanges: (<Array>|undefined)}} options.
+   */
+  printPage(options) {} // eslint-disable-line
+}
 
 /**
  * @param {!Capabilities} capabilities A capabilities object.
@@ -603,17 +627,16 @@ class IWebDriver {
  *     capability names that are not valid W3C names.
  */
 function filterNonW3CCaps(capabilities) {
-  let newCaps = new Capabilities(capabilities);
+  let newCaps = new Capabilities(capabilities)
   for (let k of newCaps.keys()) {
     // Any key containing a colon is a vendor-prefixed capability.
     if (!(W3C_CAPABILITY_NAMES.has(k) || k.indexOf(':') >= 0)) {
-      newCaps.delete(k);
+      newCaps.delete(k)
     }
   }
-  return newCaps;
+  return newCaps
 }
 
-
 /**
  * Each WebDriver instance provides automated control over a browser session.
  *
@@ -630,21 +653,21 @@ class WebDriver {
    */
   constructor(session, executor, onQuit = undefined) {
     /** @private {!Promise<!Session>} */
-    this.session_ = Promise.resolve(session);
+    this.session_ = Promise.resolve(session)
 
     // If session is a rejected promise, add a no-op rejection handler.
     // This effectively hides setup errors until users attempt to interact
     // with the session.
-    this.session_.catch(function() {});
+    this.session_.catch(function () {})
 
     /** @private {!command.Executor} */
-    this.executor_ = executor;
+    this.executor_ = executor
 
     /** @private {input.FileDetector} */
-    this.fileDetector_ = null;
+    this.fileDetector_ = null
 
     /** @private @const {(function(this: void): ?|undefined)} */
-    this.onQuit_ = onQuit;
+    this.onQuit_ = onQuit
   }
 
   /**
@@ -673,251 +696,288 @@ class WebDriver {
    * @return {!WebDriver} The driver for the newly created session.
    */
   static createSession(executor, capabilities, onQuit = undefined) {
-    let cmd = new command.Command(command.Name.NEW_SESSION);
+    let cmd = new command.Command(command.Name.NEW_SESSION)
 
     // For OSS remote ends.
-    cmd.setParameter('desiredCapabilities', capabilities);
+    cmd.setParameter('desiredCapabilities', capabilities)
     // For W3C remote ends.
     cmd.setParameter('capabilities', {
       alwaysMatch: filterNonW3CCaps(capabilities),
-    });
+    })
 
-    let session = executeCommand(executor, cmd);
+    let session = executeCommand(executor, cmd)
     if (typeof onQuit === 'function') {
-      session = session.catch(err => {
-        return Promise.resolve(onQuit.call(void 0)).then(_ => {throw err;});
-      });
+      session = session.catch((err) => {
+        return Promise.resolve(onQuit.call(void 0)).then((_) => {
+          throw err
+        })
+      })
     }
-    return new this(session, executor, onQuit);
+    return new this(session, executor, onQuit)
   }
 
   /** @override */
   async execute(command) {
-    command.setParameter('sessionId', this.session_);
-    let parameters = await toWireValue(command.getParameters());
-    command.setParameters(parameters);
-    let value = await this.executor_.execute(command);
-    return fromWireValue(this, value);
+    command.setParameter('sessionId', this.session_)
+    let parameters = await toWireValue(command.getParameters())
+    command.setParameters(parameters)
+    let value = await this.executor_.execute(command)
+    return fromWireValue(this, value)
   }
 
   /** @override */
   setFileDetector(detector) {
-    this.fileDetector_ = detector;
+    this.fileDetector_ = detector
   }
 
   /** @override */
   getExecutor() {
-    return this.executor_;
+    return this.executor_
   }
 
   /** @override */
   getSession() {
-    return this.session_;
+    return this.session_
   }
 
   /** @override */
   getCapabilities() {
-    return this.session_.then(s => s.getCapabilities());
+    return this.session_.then((s) => s.getCapabilities())
   }
 
   /** @override */
   quit() {
-    let result = this.execute(new command.Command(command.Name.QUIT));
+    let result = this.execute(new command.Command(command.Name.QUIT))
     // Delete our session ID when the quit command finishes; this will allow us
     // to throw an error when attempting to use a driver post-quit.
     return promise.finally(result, () => {
-      this.session_ = Promise.reject(new error.NoSuchSessionError(
-            'This driver instance does not have a valid session ID ' +
-            '(did you call WebDriver.quit()?) and may no longer be used.'));
+      this.session_ = Promise.reject(
+        new error.NoSuchSessionError(
+          'This driver instance does not have a valid session ID ' +
+            '(did you call WebDriver.quit()?) and may no longer be used.'
+        )
+      )
 
       // Only want the session rejection to bubble if accessed.
-      this.session_.catch(function() {});
+      this.session_.catch(function () {})
 
       if (this.onQuit_) {
-        return this.onQuit_.call(void 0);
+        return this.onQuit_.call(void 0)
       }
-    });
+    })
   }
 
   /** @override */
   actions(options) {
-    return new input.Actions(this, options || undefined);
+    return new input.Actions(this, options || undefined)
   }
 
   /** @override */
   executeScript(script, ...args) {
     if (typeof script === 'function') {
-      script = 'return (' + script + ').apply(null, arguments);';
+      script = 'return (' + script + ').apply(null, arguments);'
     }
-   return this.execute(
-        new command.Command(command.Name.EXECUTE_SCRIPT).
-            setParameter('script', script).
-            setParameter('args', args));
+    return this.execute(
+      new command.Command(command.Name.EXECUTE_SCRIPT)
+        .setParameter('script', script)
+        .setParameter('args', args)
+    )
   }
 
   /** @override */
   executeAsyncScript(script, ...args) {
     if (typeof script === 'function') {
-      script = 'return (' + script + ').apply(null, arguments);';
+      script = 'return (' + script + ').apply(null, arguments);'
     }
     return this.execute(
-        new command.Command(command.Name.EXECUTE_ASYNC_SCRIPT).
-            setParameter('script', script).
-            setParameter('args', args));
+      new command.Command(command.Name.EXECUTE_ASYNC_SCRIPT)
+        .setParameter('script', script)
+        .setParameter('args', args)
+    )
   }
 
   /** @override */
   wait(condition, timeout = 0, message = undefined, pollTimeout = 200) {
     if (typeof timeout !== 'number' || timeout < 0) {
-      throw TypeError('timeout must be a number >= 0: ' + timeout);
+      throw TypeError('timeout must be a number >= 0: ' + timeout)
     }
 
     if (typeof pollTimeout !== 'number' || pollTimeout < 0) {
-      throw TypeError('pollTimeout must be a number >= 0: ' + pollTimeout);
+      throw TypeError('pollTimeout must be a number >= 0: ' + pollTimeout)
     }
 
     if (promise.isPromise(condition)) {
       return new Promise((resolve, reject) => {
         if (!timeout) {
-          resolve(condition);
-          return;
+          resolve(condition)
+          return
         }
 
-        let start = Date.now();
-        let timer = setTimeout(function() {
-          timer = null;
-          reject(
+        let start = Date.now()
+        let timer = setTimeout(function () {
+          timer = null
+          try {
+            let timeoutMessage = resolveWaitMessage(message)
+            reject(
               new error.TimeoutError(
-                  (message ? `${message}\n` : '')
-                      + 'Timed out waiting for promise to resolve after '
-                      + (Date.now() - start) + 'ms'));
-        }, timeout);
-        const clearTimer = () => timer && clearTimeout(timer);
-
-        /** @type {!IThenable} */(condition).then(
-            function(value) {
-              clearTimer();
-              resolve(value);
-            },
-            function(error) {
-              clearTimer();
-              reject(error);
-            });
-      });
+                `${timeoutMessage}Timed out waiting for promise to resolve after ${
+                  Date.now() - start
+                }ms`
+              )
+            )
+          } catch (ex) {
+            reject(
+              new error.TimeoutError(
+                `${
+                  ex.message
+                }\nTimed out waiting for promise to resolve after ${
+                  Date.now() - start
+                }ms`
+              )
+            )
+          }
+        }, timeout)
+        const clearTimer = () => timer && clearTimeout(timer)
+
+        /** @type {!IThenable} */ condition.then(
+          function (value) {
+            clearTimer()
+            resolve(value)
+          },
+          function (error) {
+            clearTimer()
+            reject(error)
+          }
+        )
+      })
     }
 
-    let fn = /** @type {!Function} */(condition);
+    let fn = /** @type {!Function} */ (condition)
     if (condition instanceof Condition) {
-      message = message || condition.description();
-      fn = condition.fn;
+      message = message || condition.description()
+      fn = condition.fn
     }
 
     if (typeof fn !== 'function') {
       throw TypeError(
-          'Wait condition must be a promise-like object, function, or a '
-              + 'Condition object');
+        'Wait condition must be a promise-like object, function, or a ' +
+          'Condition object'
+      )
     }
 
-    const driver = this;
+    const driver = this
     function evaluateCondition() {
       return new Promise((resolve, reject) => {
         try {
-          resolve(fn(driver));
+          resolve(fn(driver))
         } catch (ex) {
-          reject(ex);
+          reject(ex)
         }
-      });
+      })
     }
 
     let result = new Promise((resolve, reject) => {
-      const startTime = Date.now();
+      const startTime = Date.now()
       const pollCondition = async () => {
-        evaluateCondition().then(function(value) {
-          const elapsed = Date.now() - startTime;
-          if (!!value) {
-            resolve(value);
+        evaluateCondition().then(function (value) {
+          const elapsed = Date.now() - startTime
+          if (value) {
+            resolve(value)
           } else if (timeout && elapsed >= timeout) {
-            reject(
+            try {
+              let timeoutMessage = resolveWaitMessage(message)
+              reject(
+                new error.TimeoutError(
+                  `${timeoutMessage}Wait timed out after ${elapsed}ms`
+                )
+              )
+            } catch (ex) {
+              reject(
                 new error.TimeoutError(
-                  (message ? `${message}\n` : '')
-                        + `Wait timed out after ${elapsed}ms`));
+                  `${ex.message}\nWait timed out after ${elapsed}ms`
+                )
+              )
+            }
           } else {
-            setTimeout(pollCondition, pollTimeout);
+            setTimeout(pollCondition, pollTimeout)
           }
-        }, reject);
-      };
-      pollCondition();
-    });
+        }, reject)
+      }
+      pollCondition()
+    })
 
     if (condition instanceof WebElementCondition) {
-      result = new WebElementPromise(this, result.then(function(value) {
-        if (!(value instanceof WebElement)) {
-          throw TypeError(
-              'WebElementCondition did not resolve to a WebElement: '
-                  + Object.prototype.toString.call(value));
-        }
-        return value;
-      }));
+      result = new WebElementPromise(
+        this,
+        result.then(function (value) {
+          if (!(value instanceof WebElement)) {
+            throw TypeError(
+              'WebElementCondition did not resolve to a WebElement: ' +
+                Object.prototype.toString.call(value)
+            )
+          }
+          return value
+        })
+      )
     }
-    return result;
+    return result
   }
 
   /** @override */
   sleep(ms) {
-    return new Promise(resolve => setTimeout(() => resolve(), ms));
+    return new Promise((resolve) => setTimeout(() => resolve(), ms))
   }
 
   /** @override */
   getWindowHandle() {
     return this.execute(
-        new command.Command(command.Name.GET_CURRENT_WINDOW_HANDLE));
+      new command.Command(command.Name.GET_CURRENT_WINDOW_HANDLE)
+    )
   }
 
   /** @override */
   getAllWindowHandles() {
-    return this.execute(
-        new command.Command(command.Name.GET_WINDOW_HANDLES));
+    return this.execute(new command.Command(command.Name.GET_WINDOW_HANDLES))
   }
 
   /** @override */
   getPageSource() {
-    return this.execute(
-        new command.Command(command.Name.GET_PAGE_SOURCE));
+    return this.execute(new command.Command(command.Name.GET_PAGE_SOURCE))
   }
 
   /** @override */
   close() {
-    return this.execute(new command.Command(command.Name.CLOSE));
+    return this.execute(new command.Command(command.Name.CLOSE))
   }
 
   /** @override */
   get(url) {
-    return this.navigate().to(url);
+    return this.navigate().to(url)
   }
 
   /** @override */
   getCurrentUrl() {
-    return this.execute(new command.Command(command.Name.GET_CURRENT_URL));
+    return this.execute(new command.Command(command.Name.GET_CURRENT_URL))
   }
 
   /** @override */
   getTitle() {
-    return this.execute(new command.Command(command.Name.GET_TITLE));
+    return this.execute(new command.Command(command.Name.GET_TITLE))
   }
 
   /** @override */
   findElement(locator) {
-    let id;
-    locator = by.checkedLocator(locator);
+    let id
+    locator = by.checkedLocator(locator)
     if (typeof locator === 'function') {
-      id = this.findElementInternal_(locator, this);
+      id = this.findElementInternal_(locator, this)
     } else {
-      let cmd = new command.Command(command.Name.FIND_ELEMENT).
-          setParameter('using', locator.using).
-          setParameter('value', locator.value);
-      id = this.execute(cmd);
+      let cmd = new command.Command(command.Name.FIND_ELEMENT)
+        .setParameter('using', locator.using)
+        .setParameter('value', locator.value)
+      id = this.execute(cmd)
     }
-    return new WebElementPromise(this, id);
+    return new WebElementPromise(this, id)
   }
 
   /**
@@ -928,34 +988,42 @@ class WebDriver {
    * @private
    */
   async findElementInternal_(locatorFn, context) {
-    let result = await locatorFn(context);
+    let result = await locatorFn(context)
     if (Array.isArray(result)) {
-      result = result[0];
+      result = result[0]
     }
     if (!(result instanceof WebElement)) {
-      throw new TypeError('Custom locator did not return a WebElement');
+      throw new TypeError('Custom locator did not return a WebElement')
     }
-    return result;
+    return result
   }
 
   /** @override */
   async findElements(locator) {
-    locator = by.checkedLocator(locator);
-    if (typeof locator === 'function') {
-      return this.findElementsInternal_(locator, this);
+    let cmd = null
+    if (locator instanceof RelativeBy) {
+      cmd = new command.Command(
+        command.Name.FIND_ELEMENTS_RELATIVE
+      ).setParameter('args', locator.marshall())
     } else {
-      let cmd = new command.Command(command.Name.FIND_ELEMENTS).
-          setParameter('using', locator.using).
-          setParameter('value', locator.value);
-      try {
-        let res = await this.execute(cmd);
-        return Array.isArray(res) ? res : [];
-      } catch (ex) {
-        if (ex instanceof error.NoSuchElementError) {
-          return [];
-        }
-        throw ex;
+      locator = by.checkedLocator(locator)
+    }
+
+    if (typeof locator === 'function') {
+      return this.findElementsInternal_(locator, this)
+    } else if (cmd === null) {
+      cmd = new command.Command(command.Name.FIND_ELEMENTS)
+        .setParameter('using', locator.using)
+        .setParameter('value', locator.value)
+    }
+    try {
+      let res = await this.execute(cmd)
+      return Array.isArray(res) ? res : []
+    } catch (ex) {
+      if (ex instanceof error.NoSuchElementError) {
+        return []
       }
+      throw ex
     }
   }
 
@@ -967,41 +1035,122 @@ class WebDriver {
    * @private
    */
   async findElementsInternal_(locatorFn, context) {
-    const result = await locatorFn(context);
+    const result = await locatorFn(context)
     if (result instanceof WebElement) {
-      return [result];
+      return [result]
     }
 
     if (!Array.isArray(result)) {
-      return [];
+      return []
     }
 
-    return result.filter(function(item) {
-      return item instanceof WebElement;
-    });
+    return result.filter(function (item) {
+      return item instanceof WebElement
+    })
   }
 
   /** @override */
   takeScreenshot() {
-    return this.execute(new command.Command(command.Name.SCREENSHOT));
+    return this.execute(new command.Command(command.Name.SCREENSHOT))
   }
 
   /** @override */
   manage() {
-    return new Options(this);
+    return new Options(this)
   }
 
   /** @override */
   navigate() {
-    return new Navigation(this);
+    return new Navigation(this)
   }
 
   /** @override */
   switchTo() {
-    return new TargetLocator(this);
+    return new TargetLocator(this)
+  }
+
+  validatePrintPageParams(keys, object) {
+    let page = {}
+    let margin = {}
+    let data
+    Object.keys(keys).forEach(function (key) {
+      data = keys[key]
+      let obj = {
+        orientation: function () {
+          object.orientation = data
+        },
+
+        scale: function () {
+          object.scale = data
+        },
+
+        background: function () {
+          object.background = data
+        },
+
+        width: function () {
+          page.width = data
+          object.page = page
+        },
+
+        height: function () {
+          page.height = data
+          object.page = page
+        },
+
+        top: function () {
+          margin.top = data
+          object.margin = margin
+        },
+
+        left: function () {
+          margin.left = data
+          object.margin = margin
+        },
+
+        bottom: function () {
+          margin.bottom = data
+          object.margin = margin
+        },
+
+        right: function () {
+          margin.right = data
+          object.margin = margin
+        },
+
+        shrinkToFit: function () {
+          object.shrinkToFit = data
+        },
+
+        pageRanges: function () {
+          object.pageRanges = data
+        },
+      }
+
+      if (!Object.prototype.hasOwnProperty.call(obj, key)) {
+        throw new error.InvalidArgumentError(`Invalid Argument '${key}'`)
+      } else {
+        obj[key]()
+      }
+    })
+
+    return object
   }
-}
 
+  /** @override */
+  printPage(options = {}) {
+    let keys = options
+    let params = {}
+    let resultObj
+
+    let self = this
+    resultObj = self.validatePrintPageParams(keys, params)
+
+    return this.execute(
+      new command.Command(command.Name.PRINT_PAGE).setParameters(resultObj)
+    )
+  }
+}
 
 /**
  * Interface for navigating back and forth in the browser history.
@@ -1020,7 +1169,7 @@ class Navigation {
    */
   constructor(driver) {
     /** @private {!WebDriver} */
-    this.driver_ = driver;
+    this.driver_ = driver
   }
 
   /**
@@ -1032,8 +1181,8 @@ class Navigation {
    */
   to(url) {
     return this.driver_.execute(
-        new command.Command(command.Name.GET).
-            setParameter('url', url));
+      new command.Command(command.Name.GET).setParameter('url', url)
+    )
   }
 
   /**
@@ -1043,7 +1192,7 @@ class Navigation {
    *     navigation event has completed.
    */
   back() {
-    return this.driver_.execute(new command.Command(command.Name.GO_BACK));
+    return this.driver_.execute(new command.Command(command.Name.GO_BACK))
   }
 
   /**
@@ -1053,7 +1202,7 @@ class Navigation {
    *     navigation event has completed.
    */
   forward() {
-    return this.driver_.execute(new command.Command(command.Name.GO_FORWARD));
+    return this.driver_.execute(new command.Command(command.Name.GO_FORWARD))
   }
 
   /**
@@ -1063,11 +1212,10 @@ class Navigation {
    *     navigation event has completed.
    */
   refresh() {
-    return this.driver_.execute(new command.Command(command.Name.REFRESH));
+    return this.driver_.execute(new command.Command(command.Name.REFRESH))
   }
 }
 
-
 /**
  * Provides methods for managing browser and driver state.
  *
@@ -1081,7 +1229,7 @@ class Options {
    */
   constructor(driver) {
     /** @private {!WebDriver} */
-    this.driver_ = driver;
+    this.driver_ = driver
   }
 
   /**
@@ -1110,37 +1258,50 @@ class Options {
    *     invalid.
    * @throws {TypeError} if `spec` is not a cookie object.
    */
-  addCookie({name, value, path, domain, secure, httpOnly, expiry}) {
+  addCookie({ name, value, path, domain, secure, httpOnly, expiry, sameSite }) {
     // We do not allow '=' or ';' in the name.
     if (/[;=]/.test(name)) {
-      throw new error.InvalidArgumentError(
-          'Invalid cookie name "' + name + '"');
+      throw new error.InvalidArgumentError('Invalid cookie name "' + name + '"')
     }
 
     // We do not allow ';' in value.
     if (/;/.test(value)) {
       throw new error.InvalidArgumentError(
-          'Invalid cookie value "' + value + '"');
+        'Invalid cookie value "' + value + '"'
+      )
     }
 
     if (typeof expiry === 'number') {
-      expiry = Math.floor(expiry);
+      expiry = Math.floor(expiry)
     } else if (expiry instanceof Date) {
-      let date = /** @type {!Date} */(expiry);
-      expiry = Math.floor(date.getTime() / 1000);
+      let date = /** @type {!Date} */ (expiry)
+      expiry = Math.floor(date.getTime() / 1000)
+    }
+
+    if (sameSite && !['Strict', 'Lax', 'None'].includes(sameSite)) {
+      throw new error.InvalidArgumentError(
+        `Invalid sameSite cookie value '${sameSite}'. It should be one of "Lax", "Strict" or "None"`
+      )
+    }
+
+    if (sameSite === 'None' && !secure) {
+      throw new error.InvalidArgumentError(
+        'Invalid cookie configuration: SameSite=None must be Secure'
+      )
     }
 
     return this.driver_.execute(
-        new command.Command(command.Name.ADD_COOKIE).
-            setParameter('cookie', {
-              'name': name,
-              'value': value,
-              'path': path,
-              'domain': domain,
-              'secure': !!secure,
-              'httpOnly': !!httpOnly,
-              'expiry': expiry
-            }));
+      new command.Command(command.Name.ADD_COOKIE).setParameter('cookie', {
+        name: name,
+        value: value,
+        path: path,
+        domain: domain,
+        secure: !!secure,
+        httpOnly: !!httpOnly,
+        expiry: expiry,
+        sameSite: sameSite,
+      })
+    )
   }
 
   /**
@@ -1151,7 +1312,8 @@ class Options {
    */
   deleteAllCookies() {
     return this.driver_.execute(
-        new command.Command(command.Name.DELETE_ALL_COOKIES));
+      new command.Command(command.Name.DELETE_ALL_COOKIES)
+    )
   }
 
   /**
@@ -1164,8 +1326,8 @@ class Options {
    */
   deleteCookie(name) {
     return this.driver_.execute(
-        new command.Command(command.Name.DELETE_COOKIE).
-            setParameter('name', name));
+      new command.Command(command.Name.DELETE_COOKIE).setParameter('name', name)
+    )
   }
 
   /**
@@ -1177,7 +1339,8 @@ class Options {
    */
   getCookies() {
     return this.driver_.execute(
-        new command.Command(command.Name.GET_ALL_COOKIES));
+      new command.Command(command.Name.GET_ALL_COOKIES)
+    )
   }
 
   /**
@@ -1187,28 +1350,30 @@ class Options {
    *
    * @param {string} name The name of the cookie to retrieve.
    * @return {!Promise<?Options.Cookie>} A promise that will be resolved
-   *     with the named cookie, or `null` if there is no such cookie.
+   *     with the named cookie
+   * @throws {error.NoSuchCookieError} if there is no such cookie.
    */
   async getCookie(name) {
     try {
-      const cookie =
-          await this.driver_.execute(
-              new command.Command(command.Name.GET_COOKIE)
-                  .setParameter('name', name));
-      return cookie;
+      const cookie = await this.driver_.execute(
+        new command.Command(command.Name.GET_COOKIE).setParameter('name', name)
+      )
+      return cookie
     } catch (err) {
-      if (!(err instanceof error.UnknownCommandError)
-          && !(err instanceof error.UnsupportedOperationError)) {
-        throw err;
+      if (
+        !(err instanceof error.UnknownCommandError) &&
+        !(err instanceof error.UnsupportedOperationError)
+      ) {
+        throw err
       }
 
-      const cookies = await this.getCookies();
+      const cookies = await this.getCookies()
       for (let cookie of cookies) {
         if (cookie && cookie['name'] === name) {
-          return cookie;
+          return cookie
         }
       }
-      return null;
+      return null
     }
   }
 
@@ -1223,7 +1388,7 @@ class Options {
    * @see #setTimeouts()
    */
   getTimeouts() {
-    return this.driver_.execute(new command.Command(command.Name.GET_TIMEOUT));
+    return this.driver_.execute(new command.Command(command.Name.GET_TIMEOUT))
   }
 
   /**
@@ -1255,60 +1420,59 @@ class Options {
    * @see #getTimeouts()
    * @see <https://w3c.github.io/webdriver/webdriver-spec.html#dfn-set-timeouts>
    */
-  setTimeouts({script, pageLoad, implicit} = {}) {
-    let cmd = new command.Command(command.Name.SET_TIMEOUT);
+  setTimeouts({ script, pageLoad, implicit } = {}) {
+    let cmd = new command.Command(command.Name.SET_TIMEOUT)
 
-    let valid = false;
+    let valid = false
     function setParam(key, value) {
       if (value === null || typeof value === 'number') {
-        valid = true;
-        cmd.setParameter(key, value);
+        valid = true
+        cmd.setParameter(key, value)
       } else if (typeof value !== 'undefined') {
         throw TypeError(
-            'invalid timeouts configuration:'
-                + ` expected "${key}" to be a number, got ${typeof value}`);
+          'invalid timeouts configuration:' +
+            ` expected "${key}" to be a number, got ${typeof value}`
+        )
       }
     }
-    setParam('implicit', implicit);
-    setParam('pageLoad', pageLoad);
-    setParam('script', script);
+    setParam('implicit', implicit)
+    setParam('pageLoad', pageLoad)
+    setParam('script', script)
 
     if (valid) {
-      return this.driver_.execute(cmd)
-          .catch(() => {
-            // Fallback to the legacy method.
-            let cmds = [];
-            if (typeof script === 'number') {
-              cmds.push(legacyTimeout(this.driver_, 'script', script));
-            }
-            if (typeof implicit === 'number') {
-              cmds.push(legacyTimeout(this.driver_, 'implicit', implicit));
-            }
-            if (typeof pageLoad === 'number') {
-              cmds.push(legacyTimeout(this.driver_, 'page load', pageLoad));
-            }
-            return Promise.all(cmds);
-          });
+      return this.driver_.execute(cmd).catch(() => {
+        // Fallback to the legacy method.
+        let cmds = []
+        if (typeof script === 'number') {
+          cmds.push(legacyTimeout(this.driver_, 'script', script))
+        }
+        if (typeof implicit === 'number') {
+          cmds.push(legacyTimeout(this.driver_, 'implicit', implicit))
+        }
+        if (typeof pageLoad === 'number') {
+          cmds.push(legacyTimeout(this.driver_, 'page load', pageLoad))
+        }
+        return Promise.all(cmds)
+      })
     }
-    throw TypeError('no timeouts specified');
+    throw TypeError('no timeouts specified')
   }
 
   /**
    * @return {!Logs} The interface for managing driver logs.
    */
   logs() {
-    return new Logs(this.driver_);
+    return new Logs(this.driver_)
   }
 
   /**
    * @return {!Window} The interface for managing the current window.
    */
   window() {
-    return new Window(this.driver_);
+    return new Window(this.driver_)
   }
 }
 
-
 /**
  * @param {!WebDriver} driver
  * @param {string} type
@@ -1317,44 +1481,39 @@ class Options {
  */
 function legacyTimeout(driver, type, ms) {
   return driver.execute(
-      new command.Command(command.Name.SET_TIMEOUT)
-          .setParameter('type', type)
-          .setParameter('ms', ms));
+    new command.Command(command.Name.SET_TIMEOUT)
+      .setParameter('type', type)
+      .setParameter('ms', ms)
+  )
 }
 
-
-
 /**
  * A record object describing a browser cookie.
  *
  * @record
  */
-Options.Cookie = function() {};
-
+Options.Cookie = function () {}
 
 /**
  * The name of the cookie.
  *
  * @type {string}
  */
-Options.Cookie.prototype.name;
-
+Options.Cookie.prototype.name
 
 /**
  * The cookie value.
  *
  * @type {string}
  */
-Options.Cookie.prototype.value;
-
+Options.Cookie.prototype.value
 
 /**
  * The cookie path. Defaults to "/" when adding a cookie.
  *
  * @type {(string|undefined)}
  */
-Options.Cookie.prototype.path;
-
+Options.Cookie.prototype.path
 
 /**
  * The domain the cookie is visible to. Defaults to the current browsing
@@ -1362,8 +1521,7 @@ Options.Cookie.prototype.path;
  *
  * @type {(string|undefined)}
  */
-Options.Cookie.prototype.domain;
-
+Options.Cookie.prototype.domain
 
 /**
  * Whether the cookie is a secure cookie. Defaults to false when adding a new
@@ -1371,8 +1529,7 @@ Options.Cookie.prototype.domain;
  *
  * @type {(boolean|undefined)}
  */
-Options.Cookie.prototype.secure;
-
+Options.Cookie.prototype.secure
 
 /**
  * Whether the cookie is an HTTP only cookie. Defaults to false when adding a
@@ -1380,8 +1537,7 @@ Options.Cookie.prototype.secure;
  *
  * @type {(boolean|undefined)}
  */
-Options.Cookie.prototype.httpOnly;
-
+Options.Cookie.prototype.httpOnly
 
 /**
  * When the cookie expires.
@@ -1394,8 +1550,18 @@ Options.Cookie.prototype.httpOnly;
  *
  * @type {(!Date|number|undefined)}
  */
-Options.Cookie.prototype.expiry;
+Options.Cookie.prototype.expiry
 
+/**
+ * When the cookie applies to a SameSite policy.
+ *
+ * When {@linkplain Options#addCookie() adding a cookie}, this may be specified
+ * as a {@link string} object which is one of 'Lax', 'Strict' or 'None'.
+ *
+ *
+ * @type {(string|undefined)}
+ */
+Options.Cookie.prototype.sameSite
 
 /**
  * An interface for managing the current window.
@@ -1415,7 +1581,7 @@ class Window {
    */
   constructor(driver) {
     /** @private {!WebDriver} */
-    this.driver_ = driver;
+    this.driver_ = driver
   }
 
   /**
@@ -1428,20 +1594,25 @@ class Window {
   async getRect() {
     try {
       return await this.driver_.execute(
-          new command.Command(command.Name.GET_WINDOW_RECT));
+        new command.Command(command.Name.GET_WINDOW_RECT)
+      )
     } catch (ex) {
       if (ex instanceof error.UnknownCommandError) {
-        let {width, height} =
-            await this.driver_.execute(
-                new command.Command(command.Name.GET_WINDOW_SIZE)
-                    .setParameter('windowHandle', 'current'));
-        let {x, y} =
-            await this.driver_.execute(
-                new command.Command(command.Name.GET_WINDOW_POSITION)
-                    .setParameter('windowHandle', 'current'));
-        return {x, y, width, height};
+        let { width, height } = await this.driver_.execute(
+          new command.Command(command.Name.GET_WINDOW_SIZE).setParameter(
+            'windowHandle',
+            'current'
+          )
+        )
+        let { x, y } = await this.driver_.execute(
+          new command.Command(command.Name.GET_WINDOW_POSITION).setParameter(
+            'windowHandle',
+            'current'
+          )
+        )
+        return { x, y, width, height }
       }
-      throw ex;
+      throw ex
     }
   }
 
@@ -1456,34 +1627,41 @@ class Window {
    *          height: (number|undefined)}} options
    *     The desired window size and position.
    * @return {!Promise<{x: number, y: number, width: number, height: number}>}
-   *     A promise that will resolve to the current widnow's updated window
+   *     A promise that will resolve to the current window's updated window
    *     rect.
    */
-  async setRect({x, y, width, height}) {
+  async setRect({ x, y, width, height }) {
     try {
       return await this.driver_.execute(
-          new command.Command(command.Name.SET_WINDOW_RECT)
-              .setParameters({x, y, width, height}));
+        new command.Command(command.Name.SET_WINDOW_RECT).setParameters({
+          x,
+          y,
+          width,
+          height,
+        })
+      )
     } catch (ex) {
       if (ex instanceof error.UnknownCommandError) {
         if (typeof x === 'number' && typeof y === 'number') {
           await this.driver_.execute(
-              new command.Command(command.Name.SET_WINDOW_POSITION)
-                  .setParameter('windowHandle', 'current')
-                  .setParameter('x', x)
-                  .setParameter('y', y));
+            new command.Command(command.Name.SET_WINDOW_POSITION)
+              .setParameter('windowHandle', 'current')
+              .setParameter('x', x)
+              .setParameter('y', y)
+          )
         }
 
-        if (typeof  width === 'number' && typeof height === 'number') {
+        if (typeof width === 'number' && typeof height === 'number') {
           await this.driver_.execute(
-              new command.Command(command.Name.SET_WINDOW_SIZE)
-                  .setParameter('windowHandle', 'current')
-                  .setParameter('width', width)
-                  .setParameter('height', height));
+            new command.Command(command.Name.SET_WINDOW_SIZE)
+              .setParameter('windowHandle', 'current')
+              .setParameter('width', width)
+              .setParameter('height', height)
+          )
         }
-        return this.getRect();
+        return this.getRect()
       }
-      throw ex;
+      throw ex
     }
   }
 
@@ -1497,13 +1675,16 @@ class Window {
    */
   maximize() {
     return this.driver_.execute(
-        new command.Command(command.Name.MAXIMIZE_WINDOW).
-            setParameter('windowHandle', 'current'));
+      new command.Command(command.Name.MAXIMIZE_WINDOW).setParameter(
+        'windowHandle',
+        'current'
+      )
+    )
   }
 
   /**
    * Minimizes the current window. The exact behavior of this command is
-   * specific to individual window managers, but typicallly involves hiding
+   * specific to individual window managers, but typically involves hiding
    * the window in the system tray.
    *
    * @return {!Promise<void>} A promise that will be resolved when the command
@@ -1511,7 +1692,8 @@ class Window {
    */
   minimize() {
     return this.driver_.execute(
-        new command.Command(command.Name.MINIMIZE_WINDOW));
+      new command.Command(command.Name.MINIMIZE_WINDOW)
+    )
   }
 
   /**
@@ -1526,11 +1708,11 @@ class Window {
    */
   fullscreen() {
     return this.driver_.execute(
-        new command.Command(command.Name.FULLSCREEN_WINDOW));
+      new command.Command(command.Name.FULLSCREEN_WINDOW)
+    )
   }
 }
 
-
 /**
  * Interface for managing WebDriver log records.
  *
@@ -1549,7 +1731,7 @@ class Logs {
    */
   constructor(driver) {
     /** @private {!WebDriver} */
-    this.driver_ = driver;
+    this.driver_ = driver
   }
 
   /**
@@ -1566,19 +1748,23 @@ class Logs {
    *   type.
    */
   get(type) {
-    let cmd = new command.Command(command.Name.GET_LOG).
-        setParameter('type', type);
-    return this.driver_.execute(cmd).
-        then(function(entries) {
-          return entries.map(function(entry) {
-            if (!(entry instanceof logging.Entry)) {
-              return new logging.Entry(
-                  entry['level'], entry['message'], entry['timestamp'],
-                  entry['type']);
-            }
-            return entry;
-          });
-        });
+    let cmd = new command.Command(command.Name.GET_LOG).setParameter(
+      'type',
+      type
+    )
+    return this.driver_.execute(cmd).then(function (entries) {
+      return entries.map(function (entry) {
+        if (!(entry instanceof logging.Entry)) {
+          return new logging.Entry(
+            entry['level'],
+            entry['message'],
+            entry['timestamp'],
+            entry['type']
+          )
+        }
+        return entry
+      })
+    })
   }
 
   /**
@@ -1588,11 +1774,11 @@ class Logs {
    */
   getAvailableLogTypes() {
     return this.driver_.execute(
-        new command.Command(command.Name.GET_AVAILABLE_LOG_TYPES));
+      new command.Command(command.Name.GET_AVAILABLE_LOG_TYPES)
+    )
   }
 }
 
-
 /**
  * An interface for changing the focus of the driver to another frame or window.
  *
@@ -1610,7 +1796,7 @@ class TargetLocator {
    */
   constructor(driver) {
     /** @private {!WebDriver} */
-    this.driver_ = driver;
+    this.driver_ = driver
   }
 
   /**
@@ -1622,8 +1808,9 @@ class TargetLocator {
    */
   activeElement() {
     var id = this.driver_.execute(
-        new command.Command(command.Name.GET_ACTIVE_ELEMENT));
-    return new WebElementPromise(this.driver_, id);
+      new command.Command(command.Name.GET_ACTIVE_ELEMENT)
+    )
+    return new WebElementPromise(this.driver_, id)
   }
 
   /**
@@ -1635,8 +1822,8 @@ class TargetLocator {
    */
   defaultContent() {
     return this.driver_.execute(
-        new command.Command(command.Name.SWITCH_TO_FRAME).
-            setParameter('id', null));
+      new command.Command(command.Name.SWITCH_TO_FRAME).setParameter('id', null)
+    )
   }
 
   /**
@@ -1659,8 +1846,8 @@ class TargetLocator {
    */
   frame(id) {
     return this.driver_.execute(
-        new command.Command(command.Name.SWITCH_TO_FRAME).
-            setParameter('id', id));
+      new command.Command(command.Name.SWITCH_TO_FRAME).setParameter('id', id)
+    )
   }
 
   /**
@@ -1673,7 +1860,8 @@ class TargetLocator {
    */
   parentFrame() {
     return this.driver_.execute(
-        new command.Command(command.Name.SWITCH_TO_FRAME_PARENT));
+      new command.Command(command.Name.SWITCH_TO_FRAME_PARENT)
+    )
   }
 
   /**
@@ -1691,11 +1879,12 @@ class TargetLocator {
    */
   window(nameOrHandle) {
     return this.driver_.execute(
-        new command.Command(command.Name.SWITCH_TO_WINDOW).
-            // "name" supports the legacy drivers. "handle" is the W3C
-            // compliant parameter.
-            setParameter('name', nameOrHandle).
-            setParameter('handle', nameOrHandle));
+      new command.Command(command.Name.SWITCH_TO_WINDOW)
+        // "name" supports the legacy drivers. "handle" is the W3C
+        // compliant parameter.
+        .setParameter('name', nameOrHandle)
+        .setParameter('handle', nameOrHandle)
+    )
   }
 
   /**
@@ -1711,12 +1900,16 @@ class TargetLocator {
    */
   newWindow(typeHint) {
     var driver = this.driver_
-    return this.driver_.execute(
-        new command.Command(command.Name.SWITCH_TO_NEW_WINDOW).
-            setParameter('type', typeHint)
-        ).then(function(response) {
-          return driver.switchTo().window(response.handle);
-        });
+    return this.driver_
+      .execute(
+        new command.Command(command.Name.SWITCH_TO_NEW_WINDOW).setParameter(
+          'type',
+          typeHint
+        )
+      )
+      .then(function (response) {
+        return driver.switchTo().window(response.handle)
+      })
   }
 
   /**
@@ -1729,25 +1922,26 @@ class TargetLocator {
    */
   alert() {
     var text = this.driver_.execute(
-        new command.Command(command.Name.GET_ALERT_TEXT));
-    var driver = this.driver_;
-    return new AlertPromise(driver, text.then(function(text) {
-      return new Alert(driver, text);
-    }));
+      new command.Command(command.Name.GET_ALERT_TEXT)
+    )
+    var driver = this.driver_
+    return new AlertPromise(
+      driver,
+      text.then(function (text) {
+        return new Alert(driver, text)
+      })
+    )
   }
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 //
 //  WebElement
 //
 //////////////////////////////////////////////////////////////////////////////
 
-
-const LEGACY_ELEMENT_ID_KEY = 'ELEMENT';
-const ELEMENT_ID_KEY = 'element-6066-11e4-a52e-4f735466cecf';
-
+const LEGACY_ELEMENT_ID_KEY = 'ELEMENT'
+const ELEMENT_ID_KEY = 'element-6066-11e4-a52e-4f735466cecf'
 
 /**
  * Represents a DOM element. WebElements can be found by searching from the
@@ -1767,10 +1961,10 @@ class WebElement {
    */
   constructor(driver, id) {
     /** @private {!WebDriver} */
-    this.driver_ = driver;
+    this.driver_ = driver
 
     /** @private {!Promise<string>} */
-    this.id_ = Promise.resolve(id);
+    this.id_ = Promise.resolve(id)
   }
 
   /**
@@ -1780,8 +1974,8 @@ class WebElement {
    */
   static buildId(id, noLegacy = false) {
     return noLegacy
-        ? {[ELEMENT_ID_KEY]: id}
-        : {[ELEMENT_ID_KEY]: id, [LEGACY_ELEMENT_ID_KEY]: id};
+      ? { [ELEMENT_ID_KEY]: id }
+      : { [ELEMENT_ID_KEY]: id, [LEGACY_ELEMENT_ID_KEY]: id }
   }
 
   /**
@@ -1794,12 +1988,12 @@ class WebElement {
   static extractId(obj) {
     if (obj && typeof obj === 'object') {
       if (typeof obj[ELEMENT_ID_KEY] === 'string') {
-        return obj[ELEMENT_ID_KEY];
+        return obj[ELEMENT_ID_KEY]
       } else if (typeof obj[LEGACY_ELEMENT_ID_KEY] === 'string') {
-        return obj[LEGACY_ELEMENT_ID_KEY];
+        return obj[LEGACY_ELEMENT_ID_KEY]
       }
     }
-    throw new TypeError('object is not a WebElement ID');
+    throw new TypeError('object is not a WebElement ID')
   }
 
   /**
@@ -1807,9 +2001,12 @@ class WebElement {
    * @return {boolean} whether the object is a valid encoded WebElement ID.
    */
   static isId(obj) {
-    return obj && typeof obj === 'object'
-        && (typeof obj[ELEMENT_ID_KEY] === 'string'
-            || typeof obj[LEGACY_ELEMENT_ID_KEY] === 'string');
+    return (
+      obj &&
+      typeof obj === 'object' &&
+      (typeof obj[ELEMENT_ID_KEY] === 'string' ||
+        typeof obj[LEGACY_ELEMENT_ID_KEY] === 'string')
+    )
   }
 
   /**
@@ -1822,15 +2019,14 @@ class WebElement {
    */
   static async equals(a, b) {
     if (a === b) {
-      return true;
+      return true
     }
-    return a.driver_.executeScript(
-      'return arguments[0] === arguments[1]', a, b);
+    return a.driver_.executeScript('return arguments[0] === arguments[1]', a, b)
   }
 
   /** @return {!WebDriver} The parent driver for this instance. */
   getDriver() {
-    return this.driver_;
+    return this.driver_
   }
 
   /**
@@ -1838,14 +2034,14 @@ class WebElement {
    *     the server-assigned opaque ID assigned to this element.
    */
   getId() {
-    return this.id_;
+    return this.id_
   }
 
   /**
    * @return {!Object} Returns the serialized representation of this WebElement.
    */
   [Symbols.serialize]() {
-    return this.getId().then(WebElement.buildId);
+    return this.getId().then(WebElement.buildId)
   }
 
   /**
@@ -1860,8 +2056,8 @@ class WebElement {
    * @private
    */
   execute_(command) {
-    command.setParameter('id', this);
-    return this.driver_.execute(command);
+    command.setParameter('id', this)
+    return this.driver_.execute(command)
   }
 
   /**
@@ -1899,18 +2095,17 @@ class WebElement {
    *     element will be invalidated and all scheduled commands aborted.
    */
   findElement(locator) {
-    locator = by.checkedLocator(locator);
-    let id;
+    locator = by.checkedLocator(locator)
+    let id
     if (typeof locator === 'function') {
-      id = this.driver_.findElementInternal_(locator, this);
+      id = this.driver_.findElementInternal_(locator, this)
     } else {
-      let cmd = new command.Command(
-          command.Name.FIND_CHILD_ELEMENT).
-          setParameter('using', locator.using).
-          setParameter('value', locator.value);
-      id = this.execute_(cmd);
+      let cmd = new command.Command(command.Name.FIND_CHILD_ELEMENT)
+        .setParameter('using', locator.using)
+        .setParameter('value', locator.value)
+      id = this.execute_(cmd)
     }
-    return new WebElementPromise(this.driver_, id);
+    return new WebElementPromise(this.driver_, id)
   }
 
   /**
@@ -1923,16 +2118,15 @@ class WebElement {
    *     array of WebElements.
    */
   async findElements(locator) {
-    locator = by.checkedLocator(locator);
-    let id;
+    locator = by.checkedLocator(locator)
     if (typeof locator === 'function') {
-      return this.driver_.findElementsInternal_(locator, this);
+      return this.driver_.findElementsInternal_(locator, this)
     } else {
       let cmd = new command.Command(command.Name.FIND_CHILD_ELEMENTS)
-          .setParameter('using', locator.using)
-          .setParameter('value', locator.value);
-      let result = await this.execute_(cmd);
-      return Array.isArray(result) ? result : [];
+        .setParameter('using', locator.using)
+        .setParameter('value', locator.value)
+      let result = await this.execute_(cmd)
+      return Array.isArray(result) ? result : []
     }
   }
 
@@ -1943,7 +2137,7 @@ class WebElement {
    *     command has completed.
    */
   click() {
-    return this.execute_(new command.Command(command.Name.CLICK_ELEMENT));
+    return this.execute_(new command.Command(command.Name.CLICK_ELEMENT))
   }
 
   /**
@@ -2002,34 +2196,37 @@ class WebElement {
    *     have been typed.
    */
   async sendKeys(...args) {
-    let keys = [];
-    (await Promise.all(args)).forEach(key => {
-      let type = typeof key;
+    let keys = []
+    ;(await Promise.all(args)).forEach((key) => {
+      let type = typeof key
       if (type === 'number') {
-        key = String(key);
+        key = String(key)
       } else if (type !== 'string') {
-        throw TypeError('each key must be a number of string; got ' + type);
+        throw TypeError('each key must be a number of string; got ' + type)
       }
 
       // The W3C protocol requires keys to be specified as an array where
       // each element is a single key.
-      keys.push(...key.split(''));
-    });
+      keys.push(...key.split(''))
+    })
 
     if (!this.driver_.fileDetector_) {
       return this.execute_(
-          new command.Command(command.Name.SEND_KEYS_TO_ELEMENT)
-              .setParameter('text', keys.join(''))
-              .setParameter('value', keys));
+        new command.Command(command.Name.SEND_KEYS_TO_ELEMENT)
+          .setParameter('text', keys.join(''))
+          .setParameter('value', keys)
+      )
     }
 
-    keys =
-        await this.driver_.fileDetector_.handleFile(
-            this.driver_, keys.join(''));
+    keys = await this.driver_.fileDetector_.handleFile(
+      this.driver_,
+      keys.join('')
+    )
     return this.execute_(
-        new command.Command(command.Name.SEND_KEYS_TO_ELEMENT)
-            .setParameter('text', keys)
-            .setParameter('value', keys.split('')));
+      new command.Command(command.Name.SEND_KEYS_TO_ELEMENT)
+        .setParameter('text', keys)
+        .setParameter('value', keys.split(''))
+    )
   }
 
   /**
@@ -2039,8 +2236,7 @@ class WebElement {
    *     element's tag name.
    */
   getTagName() {
-    return this.execute_(
-        new command.Command(command.Name.GET_ELEMENT_TAG_NAME));
+    return this.execute_(new command.Command(command.Name.GET_ELEMENT_TAG_NAME))
   }
 
   /**
@@ -2058,10 +2254,10 @@ class WebElement {
    *     requested CSS value.
    */
   getCssValue(cssStyleProperty) {
-    var name = command.Name.GET_ELEMENT_VALUE_OF_CSS_PROPERTY;
+    var name = command.Name.GET_ELEMENT_VALUE_OF_CSS_PROPERTY
     return this.execute_(
-        new command.Command(name).
-            setParameter('propertyName', cssStyleProperty));
+      new command.Command(name).setParameter('propertyName', cssStyleProperty)
+    )
   }
 
   /**
@@ -2095,8 +2291,26 @@ class WebElement {
    */
   getAttribute(attributeName) {
     return this.execute_(
-        new command.Command(command.Name.GET_ELEMENT_ATTRIBUTE).
-            setParameter('name', attributeName));
+      new command.Command(command.Name.GET_ELEMENT_ATTRIBUTE).setParameter(
+        'name',
+        attributeName
+      )
+    )
+  }
+
+  /**
+   * Get the given property of the referenced web element
+   * @param {string} propertyName The name of the attribute to query.
+   * @return {!Promise<string>} A promise that will be
+   *     resolved with the element's property value
+   */
+  getProperty(propertyName) {
+    return this.execute_(
+      new command.Command(command.Name.GET_ELEMENT_PROPERTY).setParameter(
+        'name',
+        propertyName
+      )
+    )
   }
 
   /**
@@ -2107,7 +2321,7 @@ class WebElement {
    *     resolved with the element's visible text.
    */
   getText() {
-    return this.execute_(new command.Command(command.Name.GET_ELEMENT_TEXT));
+    return this.execute_(new command.Command(command.Name.GET_ELEMENT_TEXT))
   }
 
   /**
@@ -2120,16 +2334,17 @@ class WebElement {
   async getRect() {
     try {
       return await this.execute_(
-          new command.Command(command.Name.GET_ELEMENT_RECT));
+        new command.Command(command.Name.GET_ELEMENT_RECT)
+      )
     } catch (err) {
       if (err instanceof error.UnknownCommandError) {
-        const {width, height} =
-            await this.execute_(
-                new command.Command(command.Name.GET_ELEMENT_SIZE));
-        const {x, y} =
-            await this.execute_(
-                new command.Command(command.Name.GET_ELEMENT_LOCATION));
-        return {x, y, width, height};
+        const { width, height } = await this.execute_(
+          new command.Command(command.Name.GET_ELEMENT_SIZE)
+        )
+        const { x, y } = await this.execute_(
+          new command.Command(command.Name.GET_ELEMENT_LOCATION)
+        )
+        return { x, y, width, height }
       }
     }
   }
@@ -2142,7 +2357,7 @@ class WebElement {
    *     resolved with whether this element is currently enabled.
    */
   isEnabled() {
-    return this.execute_(new command.Command(command.Name.IS_ELEMENT_ENABLED));
+    return this.execute_(new command.Command(command.Name.IS_ELEMENT_ENABLED))
   }
 
   /**
@@ -2152,8 +2367,7 @@ class WebElement {
    *     resolved with whether this element is currently selected.
    */
   isSelected() {
-    return this.execute_(
-        new command.Command(command.Name.IS_ELEMENT_SELECTED));
+    return this.execute_(new command.Command(command.Name.IS_ELEMENT_SELECTED))
   }
 
   /**
@@ -2165,7 +2379,7 @@ class WebElement {
    *     when the form has been submitted.
    */
   submit() {
-    return this.execute_(new command.Command(command.Name.SUBMIT_ELEMENT));
+    return this.execute_(new command.Command(command.Name.SUBMIT_ELEMENT))
   }
 
   /**
@@ -2177,7 +2391,7 @@ class WebElement {
    *     when the element has been cleared.
    */
   clear() {
-    return this.execute_(new command.Command(command.Name.CLEAR_ELEMENT));
+    return this.execute_(new command.Command(command.Name.CLEAR_ELEMENT))
   }
 
   /**
@@ -2187,8 +2401,7 @@ class WebElement {
    *     resolved with whether this element is currently visible on the page.
    */
   isDisplayed() {
-    return this.execute_(
-        new command.Command(command.Name.IS_ELEMENT_DISPLAYED));
+    return this.execute_(new command.Command(command.Name.IS_ELEMENT_DISPLAYED))
   }
 
   /**
@@ -2203,12 +2416,14 @@ class WebElement {
    */
   takeScreenshot(scroll = false) {
     return this.execute_(
-        new command.Command(command.Name.TAKE_ELEMENT_SCREENSHOT)
-            .setParameter('scroll', scroll));
+      new command.Command(command.Name.TAKE_ELEMENT_SCREENSHOT).setParameter(
+        'scroll',
+        scroll
+      )
+    )
   }
 }
 
-
 /**
  * WebElementPromise is a promise that will be fulfilled with a WebElement.
  * This serves as a forward proxy on WebElement, allowing calls to be
@@ -2232,35 +2447,33 @@ class WebElementPromise extends WebElement {
    *     that will resolve to the promised element.
    */
   constructor(driver, el) {
-    super(driver, 'unused');
+    super(driver, 'unused')
 
     /** @override */
-    this.then = el.then.bind(el);
+    this.then = el.then.bind(el)
 
     /** @override */
-    this.catch = el.catch.bind(el);
+    this.catch = el.catch.bind(el)
 
     /**
      * Defers returning the element ID until the wrapped WebElement has been
      * resolved.
      * @override
      */
-    this.getId = function() {
-      return el.then(function(el) {
-        return el.getId();
-      });
-    };
+    this.getId = function () {
+      return el.then(function (el) {
+        return el.getId()
+      })
+    }
   }
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 //
 //  Alert
 //
 //////////////////////////////////////////////////////////////////////////////
 
-
 /**
  * Represents a modal dialog such as {@code alert}, {@code confirm}, or
  * {@code prompt}. Provides functions to retrieve the message displayed with
@@ -2275,10 +2488,10 @@ class Alert {
    */
   constructor(driver, text) {
     /** @private {!WebDriver} */
-    this.driver_ = driver;
+    this.driver_ = driver
 
     /** @private {!Promise<string>} */
-    this.text_ = Promise.resolve(text);
+    this.text_ = Promise.resolve(text)
   }
 
   /**
@@ -2289,7 +2502,7 @@ class Alert {
    *     resolved to the text displayed with this alert.
    */
   getText() {
-    return this.text_;
+    return this.text_
   }
 
   /**
@@ -2299,8 +2512,7 @@ class Alert {
    *     when this command has completed.
    */
   accept() {
-    return this.driver_.execute(
-        new command.Command(command.Name.ACCEPT_ALERT));
+    return this.driver_.execute(new command.Command(command.Name.ACCEPT_ALERT))
   }
 
   /**
@@ -2310,8 +2522,7 @@ class Alert {
    *     when this command has completed.
    */
   dismiss() {
-    return this.driver_.execute(
-        new command.Command(command.Name.DISMISS_ALERT));
+    return this.driver_.execute(new command.Command(command.Name.DISMISS_ALERT))
   }
 
   /**
@@ -2325,12 +2536,14 @@ class Alert {
    */
   sendKeys(text) {
     return this.driver_.execute(
-        new command.Command(command.Name.SET_ALERT_TEXT).
-            setParameter('text', text));
+      new command.Command(command.Name.SET_ALERT_TEXT).setParameter(
+        'text',
+        text
+      )
+    )
   }
 }
 
-
 /**
  * AlertPromise is a promise that will be fulfilled with an Alert. This promise
  * serves as a forward proxy on an Alert, allowing calls to be scheduled
@@ -2353,60 +2566,58 @@ class AlertPromise extends Alert {
    *     that will be fulfilled with the promised alert.
    */
   constructor(driver, alert) {
-    super(driver, 'unused');
+    super(driver, 'unused')
 
     /** @override */
-    this.then = alert.then.bind(alert);
+    this.then = alert.then.bind(alert)
 
     /** @override */
-    this.catch = alert.catch.bind(alert);
+    this.catch = alert.catch.bind(alert)
 
     /**
      * Defer returning text until the promised alert has been resolved.
      * @override
      */
-    this.getText = function() {
-      return alert.then(function(alert) {
-        return alert.getText();
-      });
-    };
+    this.getText = function () {
+      return alert.then(function (alert) {
+        return alert.getText()
+      })
+    }
 
     /**
      * Defers action until the alert has been located.
      * @override
      */
-    this.accept = function() {
-      return alert.then(function(alert) {
-        return alert.accept();
-      });
-    };
+    this.accept = function () {
+      return alert.then(function (alert) {
+        return alert.accept()
+      })
+    }
 
     /**
      * Defers action until the alert has been located.
      * @override
      */
-    this.dismiss = function() {
-      return alert.then(function(alert) {
-        return alert.dismiss();
-      });
-    };
+    this.dismiss = function () {
+      return alert.then(function (alert) {
+        return alert.dismiss()
+      })
+    }
 
     /**
      * Defers action until the alert has been located.
      * @override
      */
-    this.sendKeys = function(text) {
-      return alert.then(function(alert) {
-        return alert.sendKeys(text);
-      });
-    };
+    this.sendKeys = function (text) {
+      return alert.then(function (alert) {
+        return alert.sendKeys(text)
+      })
+    }
   }
 }
 
-
 // PUBLIC API
 
-
 module.exports = {
   Alert,
   AlertPromise,
@@ -2420,5 +2631,5 @@ module.exports = {
   WebElement,
   WebElementCondition,
   WebElementPromise,
-  Window
-};
+  Window,
+}