codeceptjs 3.6.6 → 4.0.0-beta.1

package/lib/helper/WebDriver.js

@@ -1,16 +1,14 @@
-let webdriverio
-
-const assert = require('assert')
-const path = require('path')
-
-const Helper = require('@codeceptjs/helper')
-const promiseRetry = require('promise-retry')
-const stringIncludes = require('../assert/include').includes
-const { urlEquals, equals } = require('../assert/equal')
-const { debug } = require('../output')
-const { empty } = require('../assert/empty')
-const { truth } = require('../assert/truth')
-const {
+import assert from 'assert';
+import path from 'path';
+import Helper from '@codeceptjs/helper';
+import promiseRetry from 'promise-retry';
+import { includes as stringIncludes } from '../assert/include.js';
+import { urlEquals, equals } from '../assert/equal.js';
+import { debug } from '../output.js';
+import { empty } from '../assert/empty.js';
+import { truth } from '../assert/truth';
+
+import {
   xpathLocator,
   fileExists,
   decodeUrl,
@@ -19,30 +17,32 @@ const {
   screenshotOutputFolder,
   getNormalizedKeyAttributeValue,
   modifierKeys,
-} = require('../utils')
-const { isColorProperty, convertColorToRGBA } = require('../colorUtils')
-const ElementNotFound = require('./errors/ElementNotFound')
-const ConnectionRefused = require('./errors/ConnectionRefused')
-const Locator = require('../locator')
-const { highlightElement } = require('./scripts/highlightElement')
-const { focusElement } = require('./scripts/focusElement')
-const { blurElement } = require('./scripts/blurElement')
-const {
+
+} from '../utils.js';
+
+import { isColorProperty, convertColorToRGBA } from '../colorUtils';
+import ElementNotFound from './errors/ElementNotFound.js';
+import ConnectionRefused from './errors/ConnectionRefused.js';
+import Locator from '../locator.js';
+import { highlightElement } from './scripts/highlightElement';
+import { focusElement } from './scripts/focusElement';
+import { blurElement } from './scripts/blurElement';
+
+import {
   dontSeeElementError,
   seeElementError,
   seeElementInDOMError,
   dontSeeElementInDOMError,
-} = require('./errors/ElementAssertion')
-const {
-  dontSeeTraffic,
-  seeTraffic,
-  grabRecordedNetworkTraffics,
-  stopRecordingTraffic,
-  flushNetworkTraffics,
-} = require('./network/actions')
-
-const SHADOW = 'shadow'
-const webRoot = 'body'
+} from './errors/ElementAssertion';
+
+import {
+  dontSeeTraffic, seeTraffic, grabRecordedNetworkTraffics, stopRecordingTraffic, flushNetworkTraffics,
+} from './network/actions';
+
+let webdriverio;
+
+const SHADOW = 'shadow';
+const webRoot = 'body';
 
 /**
  * ## Configuration
@@ -74,7 +74,7 @@ const webRoot = 'body'
  * @prop {string} [logLevel=silent] - level of logging verbosity. Default: silent. Options: trace | debug | info | warn | error | silent. More info: https://webdriver.io/docs/configuration/#loglevel
  * @prop {boolean} [devtoolsProtocol=false] - enable devtools protocol. Default: false. More info: https://webdriver.io/docs/automationProtocols/#devtools-protocol.
  */
-const config = {}
+const config = {};
 
 /**
  * WebDriver helper which wraps [webdriverio](http://webdriver.io/) library to
@@ -445,34 +445,34 @@ const config = {}
  */
 class WebDriver extends Helper {
   constructor(config) {
-    super(config)
-    webdriverio = require('webdriverio')
+    super(config);
+    webdriverio = require('webdriverio');
 
     // set defaults
-    this.root = webRoot
-    this.isWeb = true
-    this.isRunning = false
-    this.sessionWindows = {}
-    this.activeSessionName = ''
-    this.customLocatorStrategies = config.customLocatorStrategies
+    this.root = webRoot;
+    this.isWeb = true;
+    this.isRunning = false;
+    this.sessionWindows = {};
+    this.activeSessionName = '';
+    this.customLocatorStrategies = config.customLocatorStrategies;
 
     // for network stuff
-    this.requests = []
-    this.recording = false
-    this.recordedAtLeastOnce = false
+    this.requests = [];
+    this.recording = false;
+    this.recordedAtLeastOnce = false;
 
-    this._setConfig(config)
+    this._setConfig(config);
 
     Locator.addFilter((locator, result) => {
       if (typeof locator === 'string' && locator.indexOf('~') === 0) {
         // accessibility locator
         if (this.isWeb) {
-          result.value = `[aria-label="${locator.slice(1)}"]`
-          result.type = 'css'
-          result.output = `aria-label=${locator.slice(1)}`
+          result.value = `[aria-label="${locator.slice(1)}"]`;
+          result.type = 'css';
+          result.output = `aria-label=${locator.slice(1)}`;
         }
       }
-    })
+    });
   }
 
   _validateConfig(config) {
@@ -492,41 +492,41 @@ class WebDriver extends Helper {
       keepBrowserState: false,
       deprecationWarnings: false,
       highlightElement: false,
-    }
+    };
 
     // override defaults with config
-    config = Object.assign(defaults, config)
+    config = Object.assign(defaults, config);
 
     if (config.host) {
       // webdriverio spec
-      config.hostname = config.host
-      config.path = config.path ? config.path : '/wd/hub'
+      config.hostname = config.host;
+      config.path = config.path ? config.path : '/wd/hub';
     }
 
-    config.baseUrl = config.url || config.baseUrl
+    config.baseUrl = config.url || config.baseUrl;
     if (config.desiredCapabilities && Object.keys(config.desiredCapabilities).length) {
-      config.capabilities = config.desiredCapabilities
+      config.capabilities = config.desiredCapabilities;
     }
-    config.capabilities.browserName = config.browser || config.capabilities.browserName
-    config.capabilities.browserVersion = config.browserVersion || config.capabilities.browserVersion
+    config.capabilities.browserName = config.browser || config.capabilities.browserName;
+    config.capabilities.browserVersion = config.browserVersion || config.capabilities.browserVersion;
     if (config.capabilities.chromeOptions) {
-      config.capabilities['goog:chromeOptions'] = config.capabilities.chromeOptions
-      delete config.capabilities.chromeOptions
+      config.capabilities['goog:chromeOptions'] = config.capabilities.chromeOptions;
+      delete config.capabilities.chromeOptions;
     }
     if (config.capabilities.firefoxOptions) {
-      config.capabilities['moz:firefoxOptions'] = config.capabilities.firefoxOptions
-      delete config.capabilities.firefoxOptions
+      config.capabilities['moz:firefoxOptions'] = config.capabilities.firefoxOptions;
+      delete config.capabilities.firefoxOptions;
     }
     if (config.capabilities.ieOptions) {
-      config.capabilities['se:ieOptions'] = config.capabilities.ieOptions
-      delete config.capabilities.ieOptions
+      config.capabilities['se:ieOptions'] = config.capabilities.ieOptions;
+      delete config.capabilities.ieOptions;
     }
     if (config.capabilities.selenoidOptions) {
-      config.capabilities['selenoid:options'] = config.capabilities.selenoidOptions
-      delete config.capabilities.selenoidOptions
+      config.capabilities['selenoid:options'] = config.capabilities.selenoidOptions;
+      delete config.capabilities.selenoidOptions;
     }
 
-    config.waitForTimeoutInSeconds = config.waitForTimeout / 1000 // convert to seconds
+    config.waitForTimeoutInSeconds = config.waitForTimeout / 1000; // convert to seconds
 
     if (!config.capabilities.platformName && (!config.url || !config.browser)) {
       throw new Error(`
@@ -540,201 +540,196 @@ class WebDriver extends Helper {
               }
             }
           }
-      `)
+      `);
     }
 
-    return config
+    return config;
   }
 
   static _checkRequirements() {
     try {
-      require('webdriverio')
+      require('webdriverio');
     } catch (e) {
-      return ['webdriverio@^6.12.1']
+      return ['webdriverio@^6.12.1'];
     }
   }
 
   static _config() {
-    return [
-      {
-        name: 'url',
-        message: 'Base url of site to be tested',
-        default: 'http://localhost',
-      },
-      {
-        name: 'browser',
-        message: 'Browser in which testing will be performed',
-        default: 'chrome',
-      },
-    ]
+    return [{
+      name: 'url',
+      message: 'Base url of site to be tested',
+      default: 'http://localhost',
+    }, {
+      name: 'browser',
+      message: 'Browser in which testing will be performed',
+      default: 'chrome',
+    }];
   }
 
   _beforeSuite() {
     if (!this.options.restart && !this.options.manualStart && !this.isRunning) {
-      this.debugSection('Session', 'Starting singleton browser session')
-      return this._startBrowser()
+      this.debugSection('Session', 'Starting singleton browser session');
+      return this._startBrowser();
     }
   }
 
   _lookupCustomLocator(customStrategy) {
-    if (typeof this.customLocatorStrategies !== 'object') {
-      return null
+    if (typeof (this.customLocatorStrategies) !== 'object') {
+      return null;
     }
-    const strategy = this.customLocatorStrategies[customStrategy]
-    return typeof strategy === 'function' ? strategy : null
+    const strategy = this.customLocatorStrategies[customStrategy];
+    return typeof (strategy) === 'function' ? strategy : null;
   }
 
   _isCustomLocator(locator) {
-    const locatorObj = new Locator(locator)
+    const locatorObj = new Locator(locator);
     if (locatorObj.isCustom()) {
-      const customLocator = this._lookupCustomLocator(locatorObj.type)
+      const customLocator = this._lookupCustomLocator(locatorObj.type);
       if (customLocator) {
-        return true
+        return true;
       }
-      throw new Error('Please define "customLocatorStrategies" as an Object and the Locator Strategy as a "function".')
+      throw new Error('Please define "customLocatorStrategies" as an Object and the Locator Strategy as a "function".');
     }
-    return false
+    return false;
   }
 
   async _res(locator) {
-    const res =
-      this._isShadowLocator(locator) || this._isCustomLocator(locator)
-        ? await this._locate(locator)
-        : await this.$$(withStrictLocator(locator))
-    return res
+    const res = (this._isShadowLocator(locator) || this._isCustomLocator(locator))
+      ? await this._locate(locator)
+      : await this.$$(withStrictLocator(locator));
+    return res;
   }
 
   async _startBrowser() {
     try {
       if (this.options.multiremote) {
-        this.browser = await webdriverio.multiremote(this.options.multiremote)
+        this.browser = await webdriverio.multiremote(this.options.multiremote);
       } else {
         // remove non w3c capabilities
-        delete this.options.capabilities.protocol
-        delete this.options.capabilities.hostname
-        delete this.options.capabilities.port
-        delete this.options.capabilities.path
+        delete this.options.capabilities.protocol;
+        delete this.options.capabilities.hostname;
+        delete this.options.capabilities.port;
+        delete this.options.capabilities.path;
         if (this.options.devtoolsProtocol) {
-          if (!['chrome', 'chromium'].includes(this.options.browser.toLowerCase()))
-            throw Error('The devtools protocol is only working with Chrome or Chromium')
-          this.options.automationProtocol = 'devtools'
+          if (!['chrome', 'chromium'].includes(this.options.browser.toLowerCase())) throw Error('The devtools protocol is only working with Chrome or Chromium');
+          this.options.automationProtocol = 'devtools';
         }
-        this.browser = await webdriverio.remote(this.options)
+        this.browser = await webdriverio.remote(this.options);
       }
     } catch (err) {
       if (err.toString().indexOf('ECONNREFUSED')) {
-        throw new ConnectionRefused(err)
+        throw new ConnectionRefused(err);
       }
-      throw err
+      throw err;
     }
 
-    this.isRunning = true
+    this.isRunning = true;
     if (this.options.timeouts && this.isWeb) {
-      await this.defineTimeout(this.options.timeouts)
+      await this.defineTimeout(this.options.timeouts);
     }
 
-    await this._resizeWindowIfNeeded(this.browser, this.options.windowSize)
+    await this._resizeWindowIfNeeded(this.browser, this.options.windowSize);
 
-    this.$$ = this.browser.$$.bind(this.browser)
+    this.$$ = this.browser.$$.bind(this.browser);
 
     if (this._isCustomLocatorStrategyDefined()) {
       Object.keys(this.customLocatorStrategies).forEach(async (customLocator) => {
-        this.debugSection('Weddriver', `adding custom locator strategy: ${customLocator}`)
-        const locatorFunction = this._lookupCustomLocator(customLocator)
-        this.browser.addLocatorStrategy(customLocator, locatorFunction)
-      })
+        this.debugSection('Weddriver', `adding custom locator strategy: ${customLocator}`);
+        const locatorFunction = this._lookupCustomLocator(customLocator);
+        this.browser.addLocatorStrategy(customLocator, locatorFunction);
+      });
     }
 
     if (this.browser.capabilities && this.browser.capabilities.platformName) {
-      this.browser.capabilities.platformName = this.browser.capabilities.platformName.toLowerCase()
+      this.browser.capabilities.platformName = this.browser.capabilities.platformName.toLowerCase();
     }
 
     if (this.options.automationProtocol) {
-      this.puppeteerBrowser = await this.browser.getPuppeteer()
-      this.page = (await this.puppeteerBrowser.pages())[0]
+      this.puppeteerBrowser = await this.browser.getPuppeteer();
     }
 
-    return this.browser
+    return this.browser;
   }
 
   _isCustomLocatorStrategyDefined() {
-    return this.customLocatorStrategies && Object.keys(this.customLocatorStrategies).length
+    return this.customLocatorStrategies && Object.keys(this.customLocatorStrategies).length;
   }
 
   async _stopBrowser() {
-    if (this.browser && this.isRunning) await this.browser.deleteSession()
+    if (this.browser && this.isRunning) await this.browser.deleteSession();
   }
 
   async _before() {
-    this.context = this.root
-    if (this.options.restart && !this.options.manualStart) return this._startBrowser()
-    if (!this.isRunning && !this.options.manualStart) return this._startBrowser()
-    if (this.browser) this.$$ = this.browser.$$.bind(this.browser)
-    return this.browser
+    this.context = this.root;
+    if (this.options.restart && !this.options.manualStart) return this._startBrowser();
+    if (!this.isRunning && !this.options.manualStart) return this._startBrowser();
+    if (this.browser) this.$$ = this.browser.$$.bind(this.browser);
+    return this.browser;
   }
 
   async _after() {
-    if (!this.isRunning) return
+    if (!this.isRunning) return;
     if (this.options.restart) {
-      this.isRunning = false
-      return this.browser.deleteSession()
+      this.isRunning = false;
+      return this.browser.deleteSession();
     }
-    if (this.browser.isInsideFrame) await this.browser.switchToFrame(null)
+    if (this.browser.isInsideFrame) await this.browser.switchToFrame(null);
 
-    if (this.options.keepBrowserState) return
+    if (this.options.keepBrowserState) return;
 
     if (!this.options.keepCookies && this.options.capabilities.browserName) {
-      this.debugSection('Session', 'cleaning cookies and localStorage')
-      await this.browser.deleteCookies()
+      this.debugSection('Session', 'cleaning cookies and localStorage');
+      await this.browser.deleteCookies();
     }
     await this.browser.execute('localStorage.clear();').catch((err) => {
-      if (!(err.message.indexOf("Storage is disabled inside 'data:' URLs.") > -1)) throw err
-    })
-    await this.closeOtherTabs()
-    return this.browser
+      if (!(err.message.indexOf("Storage is disabled inside 'data:' URLs.") > -1)) throw err;
+    });
+    await this.closeOtherTabs();
+    return this.browser;
   }
 
-  _afterSuite() {}
+  _afterSuite() {
+  }
 
   _finishTest() {
-    if (!this.options.restart && this.isRunning) return this._stopBrowser()
+    if (!this.options.restart && this.isRunning) return this._stopBrowser();
   }
 
   _session() {
-    const defaultSession = this.browser
+    const defaultSession = this.browser;
     return {
       start: async (sessionName, opts) => {
         // opts.disableScreenshots = true; // screenshots cant be saved as session will be already closed
-        opts = this._validateConfig(Object.assign(this.options, opts))
-        this.debugSection('New Browser', JSON.stringify(opts))
-        const browser = await webdriverio.remote(opts)
-        this.activeSessionName = sessionName
+        opts = this._validateConfig(Object.assign(this.options, opts));
+        this.debugSection('New Browser', JSON.stringify(opts));
+        const browser = await webdriverio.remote(opts);
+        this.activeSessionName = sessionName;
         if (opts.timeouts && this.isWeb) {
-          await this._defineBrowserTimeout(browser, opts.timeouts)
+          await this._defineBrowserTimeout(browser, opts.timeouts);
         }
 
-        await this._resizeWindowIfNeeded(browser, opts.windowSize)
+        await this._resizeWindowIfNeeded(browser, opts.windowSize);
 
-        return browser
+        return browser;
       },
       stop: async (browser) => {
-        if (!browser) return
-        return browser.deleteSession()
+        if (!browser) return;
+        return browser.deleteSession();
       },
       loadVars: async (browser) => {
-        if (this.context !== this.root) throw new Error("Can't start session inside within block")
-        this.browser = browser
-        this.$$ = this.browser.$$.bind(this.browser)
-        this.sessionWindows[this.activeSessionName] = browser
+        if (this.context !== this.root) throw new Error('Can\'t start session inside within block');
+        this.browser = browser;
+        this.$$ = this.browser.$$.bind(this.browser);
+        this.sessionWindows[this.activeSessionName] = browser;
       },
       restoreVars: async (session) => {
         if (!session) {
-          this.activeSessionName = ''
+          this.activeSessionName = '';
         }
-        this.browser = defaultSession
-        this.$$ = this.browser.$$.bind(this.browser)
+        this.browser = defaultSession;
+        this.$$ = this.browser.$$.bind(this.browser);
       },
-    }
+    };
   }
 
   /**
@@ -756,41 +751,41 @@ class WebDriver extends Helper {
    * @param {function} fn async functuion that executed with WebDriver helper as argument
    */
   useWebDriverTo(description, fn) {
-    return this._useTo(...arguments)
+    return this._useTo(...arguments);
   }
 
   async _failed() {
-    if (this.context !== this.root) await this._withinEnd()
+    if (this.context !== this.root) await this._withinEnd();
   }
 
   async _withinBegin(locator) {
-    const frame = isFrameLocator(locator)
+    const frame = isFrameLocator(locator);
     if (frame) {
-      this.browser.isInsideFrame = true
+      this.browser.isInsideFrame = true;
       if (Array.isArray(frame)) {
         // this.switchTo(null);
-        await forEachAsync(frame, async (f) => this.switchTo(f))
-        return
+        await forEachAsync(frame, async f => this.switchTo(f));
+        return;
       }
-      await this.switchTo(frame)
-      return
+      await this.switchTo(frame);
+      return;
     }
-    this.context = locator
+    this.context = locator;
 
-    let res = await this.browser.$$(withStrictLocator(locator))
-    assertElementExists(res, locator)
-    res = usingFirstElement(res)
-    this.context = res.selector
-    this.$$ = res.$$.bind(res)
+    let res = await this.browser.$$(withStrictLocator(locator));
+    assertElementExists(res, locator);
+    res = usingFirstElement(res);
+    this.context = res.selector;
+    this.$$ = res.$$.bind(res);
   }
 
   async _withinEnd() {
     if (this.browser.isInsideFrame) {
-      this.browser.isInsideFrame = false
-      return this.switchTo(null)
+      this.browser.isInsideFrame = false;
+      return this.switchTo(null);
     }
-    this.context = this.root
-    this.$$ = this.browser.$$.bind(this.browser)
+    this.context = this.root;
+    this.$$ = this.browser.$$.bind(this.browser);
   }
 
   /**
@@ -799,7 +794,7 @@ class WebDriver extends Helper {
    * @param {object} locator
    */
   _isShadowLocator(locator) {
-    return locator.type === SHADOW || locator[SHADOW]
+    return locator.type === SHADOW || locator[SHADOW];
   }
 
   /**
@@ -808,37 +803,35 @@ class WebDriver extends Helper {
    * @param {object} locator
    */
   async _locateShadow(locator) {
-    const shadow = locator.value ? locator.value : locator[SHADOW]
-    const shadowSequence = []
-    let elements
+    const shadow = locator.value ? locator.value : locator[SHADOW];
+    const shadowSequence = [];
+    let elements;
 
     if (!Array.isArray(shadow)) {
-      throw new Error(`Shadow '${shadow}' should be defined as an Array of elements.`)
+      throw new Error(`Shadow '${shadow}' should be defined as an Array of elements.`);
     }
 
     // traverse through the Shadow locators in sequence
     for (let index = 0; index < shadow.length; index++) {
-      const shadowElement = shadow[index]
-      shadowSequence.push(shadowElement)
+      const shadowElement = shadow[index];
+      shadowSequence.push(shadowElement);
 
       if (!elements) {
-        elements = await this.browser.$$(shadowElement)
+        elements = await (this.browser.$$(shadowElement));
       } else if (Array.isArray(elements)) {
-        elements = await elements[0].shadow$$(shadowElement)
+        elements = await elements[0].shadow$$(shadowElement);
       } else if (elements) {
-        elements = await elements.shadow$$(shadowElement)
+        elements = await elements.shadow$$(shadowElement);
       }
 
       if (!elements || !elements[0]) {
-        throw new Error(
-          `Shadow Element '${shadowElement}' is not found. It is possible the element is incorrect or elements sequence is incorrect. Please verify the sequence '${shadowSequence.join('>')}' is correctly chained.`,
-        )
+        throw new Error(`Shadow Element '${shadowElement}' is not found. It is possible the element is incorrect or elements sequence is incorrect. Please verify the sequence '${shadowSequence.join('>')}' is correctly chained.`);
       }
     }
 
-    this.debugSection('Elements', `Found ${elements.length} '${SHADOW}' elements`)
+    this.debugSection('Elements', `Found ${elements.length} '${SHADOW}' elements`);
 
-    return elements
+    return elements;
   }
 
   /**
@@ -847,11 +840,8 @@ class WebDriver extends Helper {
    * @param {object} locator
    */
   async _smartWait(locator) {
-    this.debugSection(
-      `SmartWait (${this.options.smartWait}ms)`,
-      `Locating ${JSON.stringify(locator)} in ${this.options.smartWait}`,
-    )
-    await this.defineTimeout({ implicit: this.options.smartWait })
+    this.debugSection(`SmartWait (${this.options.smartWait}ms)`, `Locating ${JSON.stringify(locator)} in ${this.options.smartWait}`);
+    await this.defineTimeout({ implicit: this.options.smartWait });
   }
 
   /**
@@ -866,53 +856,53 @@ class WebDriver extends Helper {
    * @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
    */
   async _locate(locator, smartWait = false) {
-    if (require('../store').debugMode) smartWait = false
+    if (require('../store.js').debugMode) smartWait = false;
 
     // special locator type for Shadow DOM
     if (this._isShadowLocator(locator)) {
       if (!this.options.smartWait || !smartWait) {
-        const els = await this._locateShadow(locator)
-        return els
+        const els = await this._locateShadow(locator);
+        return els;
       }
 
-      const els = await this._locateShadow(locator)
-      return els
+      const els = await this._locateShadow(locator);
+      return els;
     }
 
     // special locator type for React
     if (locator.react) {
-      const els = await this.browser.react$$(locator.react, locator.props || undefined, locator.state || undefined)
-      this.debugSection('Elements', `Found ${els.length} react components`)
-      return els
+      const els = await this.browser.react$$(locator.react, locator.props || undefined, locator.state || undefined);
+      this.debugSection('Elements', `Found ${els.length} react components`);
+      return els;
     }
 
     if (!this.options.smartWait || !smartWait) {
       if (this._isCustomLocator(locator)) {
-        const locatorObj = new Locator(locator)
-        return this.browser.custom$$(locatorObj.type, locatorObj.value)
+        const locatorObj = new Locator(locator);
+        return this.browser.custom$$(locatorObj.type, locatorObj.value);
       }
 
-      const els = await this.$$(withStrictLocator(locator))
-      return els
+      const els = await this.$$(withStrictLocator(locator));
+      return els;
     }
 
-    await this._smartWait(locator)
+    await this._smartWait(locator);
 
     if (this._isCustomLocator(locator)) {
-      const locatorObj = new Locator(locator)
-      return this.browser.custom$$(locatorObj.type, locatorObj.value)
+      const locatorObj = new Locator(locator);
+      return this.browser.custom$$(locatorObj.type, locatorObj.value);
     }
 
-    const els = await this.$$(withStrictLocator(locator))
-    await this.defineTimeout({ implicit: 0 })
-    return els
+    const els = await this.$$(withStrictLocator(locator));
+    await this.defineTimeout({ implicit: 0 });
+    return els;
   }
 
   _grabCustomLocator(locator) {
     if (typeof locator === 'string') {
-      locator = new Locator(locator)
+      locator = new Locator(locator);
     }
-    return locator.value ? locator.value : locator.custom
+    return locator.value ? locator.value : locator.custom;
   }
 
   /**
@@ -925,7 +915,7 @@ class WebDriver extends Helper {
    * @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
    */
   async _locateCheckable(locator) {
-    return findCheckable.call(this, locator, this.$$.bind(this)).then((res) => res)
+    return findCheckable.call(this, locator, this.$$.bind(this)).then(res => res);
   }
 
   /**
@@ -939,8 +929,8 @@ class WebDriver extends Helper {
    * @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
    */
   async _locateClickable(locator, context) {
-    const locateFn = prepareLocateFn.call(this, context)
-    return findClickable.call(this, locator, locateFn)
+    const locateFn = prepareLocateFn.call(this, context);
+    return findClickable.call(this, locator, locateFn);
   }
 
   /**
@@ -953,7 +943,7 @@ class WebDriver extends Helper {
    * @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
    */
   async _locateFields(locator) {
-    return findFields.call(this, locator).then((res) => res)
+    return findFields.call(this, locator).then(res => res);
   }
 
   /**
@@ -961,7 +951,7 @@ class WebDriver extends Helper {
    *
    */
   async grabWebElements(locator) {
-    return this._locate(locator)
+    return this._locate(locator);
   }
 
   /**
@@ -977,11 +967,11 @@ class WebDriver extends Helper {
    * @param {*} timeouts WebDriver timeouts object.
    */
   defineTimeout(timeouts) {
-    return this._defineBrowserTimeout(this.browser, timeouts)
+    return this._defineBrowserTimeout(this.browser, timeouts);
   }
 
   _defineBrowserTimeout(browser, timeouts) {
-    return browser.setTimeout(timeouts)
+    return browser.setTimeout(timeouts);
   }
 
   /**
@@ -989,15 +979,15 @@ class WebDriver extends Helper {
    *
    */
   amOnPage(url) {
-    let split_url
+    let split_url;
     if (this.options.basicAuth) {
       if (url.startsWith('/')) {
-        url = this.options.url + url
+        url = this.options.url + url;
       }
-      split_url = url.split('//')
-      url = `${split_url[0]}//${this.options.basicAuth.username}:${this.options.basicAuth.password}@${split_url[1]}`
+      split_url = url.split('//');
+      url = `${split_url[0]}//${this.options.basicAuth.username}:${this.options.basicAuth.password}@${split_url[1]}`;
     }
-    return this.browser.url(url)
+    return this.browser.url(url);
   }
 
   /**
@@ -1006,18 +996,18 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async click(locator, context = null) {
-    const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick'
-    const locateFn = prepareLocateFn.call(this, context)
+    const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick';
+    const locateFn = prepareLocateFn.call(this, context);
 
-    const res = await findClickable.call(this, locator, locateFn)
+    const res = await findClickable.call(this, locator, locateFn);
     if (context) {
-      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`)
+      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`);
     } else {
-      assertElementExists(res, locator, 'Clickable element')
+      assertElementExists(res, locator, 'Clickable element');
     }
-    const elem = usingFirstElement(res)
-    highlightActiveElement.call(this, elem)
-    return this.browser[clickMethod](getElementId(elem))
+    const elem = usingFirstElement(res);
+    highlightActiveElement.call(this, elem);
+    return this.browser[clickMethod](getElementId(elem));
   }
 
   /**
@@ -1026,25 +1016,25 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async forceClick(locator, context = null) {
-    const locateFn = prepareLocateFn.call(this, context)
+    const locateFn = prepareLocateFn.call(this, context);
 
-    const res = await findClickable.call(this, locator, locateFn)
+    const res = await findClickable.call(this, locator, locateFn);
     if (context) {
-      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`)
+      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`);
     } else {
-      assertElementExists(res, locator, 'Clickable element')
+      assertElementExists(res, locator, 'Clickable element');
     }
-    const elem = usingFirstElement(res)
-    highlightActiveElement.call(this, elem)
+    const elem = usingFirstElement(res);
+    highlightActiveElement.call(this, elem);
 
     return this.executeScript((el) => {
       if (document.activeElement instanceof HTMLElement) {
-        document.activeElement.blur()
+        document.activeElement.blur();
       }
-      const event = document.createEvent('MouseEvent')
-      event.initEvent('click', true, true)
-      return el.dispatchEvent(event)
-    }, elem)
+      const event = document.createEvent('MouseEvent');
+      event.initEvent('click', true, true);
+      return el.dispatchEvent(event);
+    }, elem);
   }
 
   /**
@@ -1053,18 +1043,18 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async doubleClick(locator, context = null) {
-    const locateFn = prepareLocateFn.call(this, context)
+    const locateFn = prepareLocateFn.call(this, context);
 
-    const res = await findClickable.call(this, locator, locateFn)
+    const res = await findClickable.call(this, locator, locateFn);
     if (context) {
-      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`)
+      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`);
     } else {
-      assertElementExists(res, locator, 'Clickable element')
+      assertElementExists(res, locator, 'Clickable element');
     }
 
-    const elem = usingFirstElement(res)
-    highlightActiveElement.call(this, elem)
-    return elem.doubleClick()
+    const elem = usingFirstElement(res);
+    highlightActiveElement.call(this, elem);
+    return elem.doubleClick();
   }
 
   /**
@@ -1073,24 +1063,24 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async rightClick(locator, context) {
-    const locateFn = prepareLocateFn.call(this, context)
+    const locateFn = prepareLocateFn.call(this, context);
 
-    const res = await findClickable.call(this, locator, locateFn)
+    const res = await findClickable.call(this, locator, locateFn);
     if (context) {
-      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`)
+      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`);
     } else {
-      assertElementExists(res, locator, 'Clickable element')
+      assertElementExists(res, locator, 'Clickable element');
     }
 
-    const el = usingFirstElement(res)
+    const el = usingFirstElement(res);
 
-    await el.moveTo()
+    await el.moveTo();
 
     if (this.browser.isW3C) {
-      return el.click({ button: 'right' })
+      return el.click({ button: 'right' });
     }
     // JSON Wire version
-    await this.browser.buttonDown(2)
+    await this.browser.buttonDown(2);
   }
 
   /**
@@ -1099,24 +1089,24 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async forceRightClick(locator, context = null) {
-    const locateFn = prepareLocateFn.call(this, context)
+    const locateFn = prepareLocateFn.call(this, context);
 
-    const res = await findClickable.call(this, locator, locateFn)
+    const res = await findClickable.call(this, locator, locateFn);
     if (context) {
-      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`)
+      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`);
     } else {
-      assertElementExists(res, locator, 'Clickable element')
+      assertElementExists(res, locator, 'Clickable element');
     }
-    const elem = usingFirstElement(res)
+    const elem = usingFirstElement(res);
 
     return this.executeScript((el) => {
       if (document.activeElement instanceof HTMLElement) {
-        document.activeElement.blur()
+        document.activeElement.blur();
       }
-      const event = document.createEvent('MouseEvent')
-      event.initEvent('contextmenu', true, true)
-      return el.dispatchEvent(event)
-    }, elem)
+      const event = document.createEvent('MouseEvent');
+      event.initEvent('contextmenu', true, true);
+      return el.dispatchEvent(event);
+    }, elem);
   }
 
   /**
@@ -1126,12 +1116,12 @@ class WebDriver extends Helper {
    *
    */
   async fillField(field, value) {
-    const res = await findFields.call(this, field)
-    assertElementExists(res, field, 'Field')
-    const elem = usingFirstElement(res)
-    highlightActiveElement.call(this, elem)
-    await elem.clearValue()
-    await elem.setValue(value.toString())
+    const res = await findFields.call(this, field);
+    assertElementExists(res, field, 'Field');
+    const elem = usingFirstElement(res);
+    highlightActiveElement.call(this, elem);
+    await elem.clearValue();
+    await elem.setValue(value.toString());
   }
 
   /**
@@ -1139,15 +1129,15 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async appendField(field, value) {
-    const res = await findFields.call(this, field)
-    assertElementExists(res, field, 'Field')
-    const elem = usingFirstElement(res)
-    highlightActiveElement.call(this, elem)
+    const res = await findFields.call(this, field);
+    assertElementExists(res, field, 'Field');
+    const elem = usingFirstElement(res);
+    highlightActiveElement.call(this, elem);
     if (this.options.automationProtocol) {
-      const curentValue = await elem.getValue()
-      return elem.setValue(curentValue + value.toString())
+      const curentValue = await elem.getValue();
+      return elem.setValue(curentValue + value.toString());
     }
-    return elem.addValue(value.toString())
+    return elem.addValue(value.toString());
   }
 
   /**
@@ -1155,63 +1145,47 @@ class WebDriver extends Helper {
    *
    */
   async clearField(field) {
-    const res = await findFields.call(this, field)
-    assertElementExists(res, field, 'Field')
-    const elem = usingFirstElement(res)
-    highlightActiveElement.call(this, elem)
+    const res = await findFields.call(this, field);
+    assertElementExists(res, field, 'Field');
+    const elem = usingFirstElement(res);
+    highlightActiveElement.call(this, elem);
     if (this.options.automationProtocol) {
-      return elem.setValue('')
+      return elem.setValue('');
     }
-    return elem.clearValue(getElementId(elem))
+    return elem.clearValue(getElementId(elem));
   }
 
   /**
    * {{> selectOption }}
    */
   async selectOption(select, option) {
-    const res = await findFields.call(this, select)
-    assertElementExists(res, select, 'Selectable field')
-    const elem = usingFirstElement(res)
-    highlightActiveElement.call(this, elem)
+    const res = await findFields.call(this, select);
+    assertElementExists(res, select, 'Selectable field');
+    const elem = usingFirstElement(res);
+    highlightActiveElement.call(this, elem);
 
     if (!Array.isArray(option)) {
-      option = [option]
+      option = [option];
     }
 
     // select options by visible text
-    let els = await forEachAsync(option, async (opt) =>
-      this.browser.findElementsFromElement(
-        getElementId(elem),
-        'xpath',
-        Locator.select.byVisibleText(xpathLocator.literal(opt)),
-      ),
-    )
+    let els = await forEachAsync(option, async opt => this.browser.findElementsFromElement(getElementId(elem), 'xpath', Locator.select.byVisibleText(xpathLocator.literal(opt))));
 
     const clickOptionFn = async (el) => {
-      if (el[0]) el = el[0]
-      const elementId = getElementId(el)
-      if (elementId) return this.browser.elementClick(elementId)
-    }
+      if (el[0]) el = el[0];
+      const elementId = getElementId(el);
+      if (elementId) return this.browser.elementClick(elementId);
+    };
 
     if (Array.isArray(els) && els.length) {
-      return forEachAsync(els, clickOptionFn)
+      return forEachAsync(els, clickOptionFn);
     }
     // select options by value
-    els = await forEachAsync(option, async (opt) =>
-      this.browser.findElementsFromElement(
-        getElementId(elem),
-        'xpath',
-        Locator.select.byValue(xpathLocator.literal(opt)),
-      ),
-    )
+    els = await forEachAsync(option, async opt => this.browser.findElementsFromElement(getElementId(elem), 'xpath', Locator.select.byValue(xpathLocator.literal(opt))));
     if (els.length === 0) {
-      throw new ElementNotFound(
-        select,
-        `Option "${option}" in`,
-        'was not found neither by a visible text nor by a value',
-      )
+      throw new ElementNotFound(select, `Option "${option}" in`, 'was not found neither by a visible text nor by a value');
     }
-    return forEachAsync(els, clickOptionFn)
+    return forEachAsync(els, clickOptionFn);
   }
 
   /**
@@ -1220,29 +1194,27 @@ class WebDriver extends Helper {
    * {{> attachFile }}
    */
   async attachFile(locator, pathToFile) {
-    let file = path.join(global.codecept_dir, pathToFile)
+    let file = path.join(global.codecept_dir, pathToFile);
     if (!fileExists(file)) {
-      throw new Error(`File at ${file} can not be found on local system`)
+      throw new Error(`File at ${file} can not be found on local system`);
     }
 
-    const res = await findFields.call(this, locator)
-    this.debug(`Uploading ${file}`)
-    assertElementExists(res, locator, 'File field')
-    const el = usingFirstElement(res)
+    const res = await findFields.call(this, locator);
+    this.debug(`Uploading ${file}`);
+    assertElementExists(res, locator, 'File field');
+    const el = usingFirstElement(res);
 
     // Remote Upload (when running Selenium Server)
     if (this.options.remoteFileUpload && !this.options.automationProtocol) {
       try {
-        this.debugSection('File', 'Uploading file to remote server')
-        file = await this.browser.uploadFile(file)
+        this.debugSection('File', 'Uploading file to remote server');
+        file = await this.browser.uploadFile(file);
       } catch (err) {
-        throw new Error(
-          `File can't be transferred to remote server. Set \`remoteFileUpload: false\` in config to upload file locally.\n${err.message}`,
-        )
+        throw new Error(`File can't be transferred to remote server. Set \`remoteFileUpload: false\` in config to upload file locally.\n${err.message}`);
       }
     }
 
-    return el.addValue(file)
+    return el.addValue(file);
   }
 
   /**
@@ -1250,19 +1222,19 @@ class WebDriver extends Helper {
    * {{> checkOption }}
    */
   async checkOption(field, context = null) {
-    const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick'
-    const locateFn = prepareLocateFn.call(this, context)
+    const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick';
+    const locateFn = prepareLocateFn.call(this, context);
 
-    const res = await findCheckable.call(this, field, locateFn)
+    const res = await findCheckable.call(this, field, locateFn);
 
-    assertElementExists(res, field, 'Checkable')
-    const elem = usingFirstElement(res)
-    const elementId = getElementId(elem)
-    highlightActiveElement.call(this, elem)
+    assertElementExists(res, field, 'Checkable');
+    const elem = usingFirstElement(res);
+    const elementId = getElementId(elem);
+    highlightActiveElement.call(this, elem);
 
-    const isSelected = await this.browser.isElementSelected(elementId)
-    if (isSelected) return Promise.resolve(true)
-    return this.browser[clickMethod](elementId)
+    const isSelected = await this.browser.isElementSelected(elementId);
+    if (isSelected) return Promise.resolve(true);
+    return this.browser[clickMethod](elementId);
   }
 
   /**
@@ -1270,19 +1242,19 @@ class WebDriver extends Helper {
    * {{> uncheckOption }}
    */
   async uncheckOption(field, context = null) {
-    const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick'
-    const locateFn = prepareLocateFn.call(this, context)
+    const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick';
+    const locateFn = prepareLocateFn.call(this, context);
 
-    const res = await findCheckable.call(this, field, locateFn)
+    const res = await findCheckable.call(this, field, locateFn);
 
-    assertElementExists(res, field, 'Checkable')
-    const elem = usingFirstElement(res)
-    const elementId = getElementId(elem)
-    highlightActiveElement.call(this, elem)
+    assertElementExists(res, field, 'Checkable');
+    const elem = usingFirstElement(res);
+    const elementId = getElementId(elem);
+    highlightActiveElement.call(this, elem);
 
-    const isSelected = await this.browser.isElementSelected(elementId)
-    if (!isSelected) return Promise.resolve(true)
-    return this.browser[clickMethod](elementId)
+    const isSelected = await this.browser.isElementSelected(elementId);
+    if (!isSelected) return Promise.resolve(true);
+    return this.browser[clickMethod](elementId);
   }
 
   /**
@@ -1290,10 +1262,10 @@ class WebDriver extends Helper {
    *
    */
   async grabTextFromAll(locator) {
-    const res = await this._locate(locator, true)
-    const val = await forEachAsync(res, (el) => this.browser.getElementText(getElementId(el)))
-    this.debugSection('GrabText', String(val))
-    return val
+    const res = await this._locate(locator, true);
+    const val = await forEachAsync(res, el => this.browser.getElementText(getElementId(el)));
+    this.debugSection('GrabText', String(val));
+    return val;
   }
 
   /**
@@ -1301,13 +1273,13 @@ class WebDriver extends Helper {
    *
    */
   async grabTextFrom(locator) {
-    const texts = await this.grabTextFromAll(locator)
-    assertElementExists(texts, locator)
+    const texts = await this.grabTextFromAll(locator);
+    assertElementExists(texts, locator);
     if (texts.length > 1) {
-      this.debugSection('GrabText', `Using first element out of ${texts.length}`)
+      this.debugSection('GrabText', `Using first element out of ${texts.length}`);
     }
 
-    return texts[0]
+    return texts[0];
   }
 
   /**
@@ -1315,10 +1287,10 @@ class WebDriver extends Helper {
    *
    */
   async grabHTMLFromAll(locator) {
-    const elems = await this._locate(locator, true)
-    const html = await forEachAsync(elems, (elem) => elem.getHTML(false))
-    this.debugSection('GrabHTML', String(html))
-    return html
+    const elems = await this._locate(locator, true);
+    const html = await forEachAsync(elems, elem => elem.getHTML(false));
+    this.debugSection('GrabHTML', String(html));
+    return html;
   }
 
   /**
@@ -1326,13 +1298,13 @@ class WebDriver extends Helper {
    *
    */
   async grabHTMLFrom(locator) {
-    const html = await this.grabHTMLFromAll(locator)
-    assertElementExists(html, locator)
+    const html = await this.grabHTMLFromAll(locator);
+    assertElementExists(html, locator);
     if (html.length > 1) {
-      this.debugSection('GrabHTML', `Using first element out of ${html.length}`)
+      this.debugSection('GrabHTML', `Using first element out of ${html.length}`);
     }
 
-    return html[0]
+    return html[0];
   }
 
   /**
@@ -1340,11 +1312,11 @@ class WebDriver extends Helper {
    *
    */
   async grabValueFromAll(locator) {
-    const res = await this._locate(locator, true)
-    const val = await forEachAsync(res, (el) => el.getValue())
-    this.debugSection('GrabValue', String(val))
+    const res = await this._locate(locator, true);
+    const val = await forEachAsync(res, el => el.getValue());
+    this.debugSection('GrabValue', String(val));
 
-    return val
+    return val;
   }
 
   /**
@@ -1352,92 +1324,92 @@ class WebDriver extends Helper {
    *
    */
   async grabValueFrom(locator) {
-    const values = await this.grabValueFromAll(locator)
-    assertElementExists(values, locator)
+    const values = await this.grabValueFromAll(locator);
+    assertElementExists(values, locator);
     if (values.length > 1) {
-      this.debugSection('GrabValue', `Using first element out of ${values.length}`)
+      this.debugSection('GrabValue', `Using first element out of ${values.length}`);
     }
 
-    return values[0]
+    return values[0];
   }
 
   /**
    * {{> grabCssPropertyFromAll }}
    */
   async grabCssPropertyFromAll(locator, cssProperty) {
-    const res = await this._locate(locator, true)
-    const val = await forEachAsync(res, async (el) => this.browser.getElementCSSValue(getElementId(el), cssProperty))
-    this.debugSection('Grab', String(val))
-    return val
+    const res = await this._locate(locator, true);
+    const val = await forEachAsync(res, async el => this.browser.getElementCSSValue(getElementId(el), cssProperty));
+    this.debugSection('Grab', String(val));
+    return val;
   }
 
   /**
    * {{> grabCssPropertyFrom }}
    */
   async grabCssPropertyFrom(locator, cssProperty) {
-    const cssValues = await this.grabCssPropertyFromAll(locator, cssProperty)
-    assertElementExists(cssValues, locator)
+    const cssValues = await this.grabCssPropertyFromAll(locator, cssProperty);
+    assertElementExists(cssValues, locator);
 
     if (cssValues.length > 1) {
-      this.debugSection('GrabCSS', `Using first element out of ${cssValues.length}`)
+      this.debugSection('GrabCSS', `Using first element out of ${cssValues.length}`);
     }
 
-    return cssValues[0]
+    return cssValues[0];
   }
 
   /**
    * {{> grabAttributeFromAll }}
    */
   async grabAttributeFromAll(locator, attr) {
-    const res = await this._locate(locator, true)
-    const val = await forEachAsync(res, async (el) => el.getAttribute(attr))
-    this.debugSection('GrabAttribute', String(val))
-    return val
+    const res = await this._locate(locator, true);
+    const val = await forEachAsync(res, async el => el.getAttribute(attr));
+    this.debugSection('GrabAttribute', String(val));
+    return val;
   }
 
   /**
    * {{> grabAttributeFrom }}
    */
   async grabAttributeFrom(locator, attr) {
-    const attrs = await this.grabAttributeFromAll(locator, attr)
-    assertElementExists(attrs, locator)
+    const attrs = await this.grabAttributeFromAll(locator, attr);
+    assertElementExists(attrs, locator);
     if (attrs.length > 1) {
-      this.debugSection('GrabAttribute', `Using first element out of ${attrs.length}`)
+      this.debugSection('GrabAttribute', `Using first element out of ${attrs.length}`);
     }
-    return attrs[0]
+    return attrs[0];
   }
 
   /**
    * {{> seeInTitle }}
    */
   async seeInTitle(text) {
-    const title = await this.browser.getTitle()
-    return stringIncludes('web page title').assert(text, title)
+    const title = await this.browser.getTitle();
+    return stringIncludes('web page title').assert(text, title);
   }
 
   /**
    * {{> seeTitleEquals }}
    */
   async seeTitleEquals(text) {
-    const title = await this.browser.getTitle()
-    return assert.equal(title, text, `expected web page title to be ${text}, but found ${title}`)
+    const title = await this.browser.getTitle();
+    return assert.equal(title, text, `expected web page title to be ${text}, but found ${title}`);
   }
 
   /**
    * {{> dontSeeInTitle }}
    */
   async dontSeeInTitle(text) {
-    const title = await this.browser.getTitle()
-    return stringIncludes('web page title').negate(text, title)
+    const title = await this.browser.getTitle();
+    return stringIncludes('web page title').negate(text, title);
   }
 
   /**
    * {{> grabTitle }}
    */
   async grabTitle() {
-    const title = await this.browser.getTitle()
-    this.debugSection('Title', title)
-    return title
+    const title = await this.browser.getTitle();
+    this.debugSection('Title', title);
+    return title;
   }
 
   /**
@@ -1446,14 +1418,14 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async see(text, context = null) {
-    return proceedSee.call(this, 'assert', text, context)
+    return proceedSee.call(this, 'assert', text, context);
   }
 
   /**
    * {{> seeTextEquals }}
    */
   async seeTextEquals(text, context = null) {
-    return proceedSee.call(this, 'assert', text, context, true)
+    return proceedSee.call(this, 'assert', text, context, true);
   }
 
   /**
@@ -1462,7 +1434,7 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async dontSee(text, context = null) {
-    return proceedSee.call(this, 'negate', text, context)
+    return proceedSee.call(this, 'negate', text, context);
   }
 
   /**
@@ -1470,8 +1442,8 @@ class WebDriver extends Helper {
    *
    */
   async seeInField(field, value) {
-    const _value = typeof value === 'boolean' ? value : value.toString()
-    return proceedSeeField.call(this, 'assert', field, _value)
+    const _value = (typeof value === 'boolean') ? value : value.toString();
+    return proceedSeeField.call(this, 'assert', field, _value);
   }
 
   /**
@@ -1479,8 +1451,8 @@ class WebDriver extends Helper {
    *
    */
   async dontSeeInField(field, value) {
-    const _value = typeof value === 'boolean' ? value : value.toString()
-    return proceedSeeField.call(this, 'negate', field, _value)
+    const _value = (typeof value === 'boolean') ? value : value.toString();
+    return proceedSeeField.call(this, 'negate', field, _value);
   }
 
   /**
@@ -1488,7 +1460,7 @@ class WebDriver extends Helper {
    * {{> seeCheckboxIsChecked }}
    */
   async seeCheckboxIsChecked(field) {
-    return proceedSeeCheckbox.call(this, 'assert', field)
+    return proceedSeeCheckbox.call(this, 'assert', field);
   }
 
   /**
@@ -1496,7 +1468,7 @@ class WebDriver extends Helper {
    * {{> dontSeeCheckboxIsChecked }}
    */
   async dontSeeCheckboxIsChecked(field) {
-    return proceedSeeCheckbox.call(this, 'negate', field)
+    return proceedSeeCheckbox.call(this, 'negate', field);
   }
 
   /**
@@ -1505,13 +1477,13 @@ class WebDriver extends Helper {
    *
    */
   async seeElement(locator) {
-    const res = await this._locate(locator, true)
-    assertElementExists(res, locator)
-    const selected = await forEachAsync(res, async (el) => el.isDisplayed())
+    const res = await this._locate(locator, true);
+    assertElementExists(res, locator);
+    const selected = await forEachAsync(res, async el => el.isDisplayed());
     try {
-      return truth(`elements of ${new Locator(locator)}`, 'to be seen').assert(selected)
+      return truth(`elements of ${(new Locator(locator))}`, 'to be seen').assert(selected);
     } catch (e) {
-      dontSeeElementError(locator)
+      dontSeeElementError(locator);
     }
   }
 
@@ -1520,15 +1492,15 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async dontSeeElement(locator) {
-    const res = await this._locate(locator, false)
+    const res = await this._locate(locator, false);
     if (!res || res.length === 0) {
-      return truth(`elements of ${new Locator(locator)}`, 'to be seen').negate(false)
+      return truth(`elements of ${(new Locator(locator))}`, 'to be seen').negate(false);
     }
-    const selected = await forEachAsync(res, async (el) => el.isDisplayed())
+    const selected = await forEachAsync(res, async el => el.isDisplayed());
     try {
-      return truth(`elements of ${new Locator(locator)}`, 'to be seen').negate(selected)
+      return truth(`elements of ${(new Locator(locator))}`, 'to be seen').negate(selected);
     } catch (e) {
-      seeElementError(locator)
+      seeElementError(locator);
     }
   }
 
@@ -1537,11 +1509,11 @@ class WebDriver extends Helper {
    *
    */
   async seeElementInDOM(locator) {
-    const res = await this._res(locator)
+    const res = await this._res(locator);
     try {
-      return empty('elements').negate(res)
+      return empty('elements').negate(res);
     } catch (e) {
-      dontSeeElementInDOMError(locator)
+      dontSeeElementInDOMError(locator);
     }
   }
 
@@ -1550,11 +1522,11 @@ class WebDriver extends Helper {
    *
    */
   async dontSeeElementInDOM(locator) {
-    const res = await this._res(locator)
+    const res = await this._res(locator);
     try {
-      return empty('elements').assert(res)
+      return empty('elements').assert(res);
     } catch (e) {
-      seeElementInDOMError(locator)
+      seeElementInDOMError(locator);
     }
   }
 
@@ -1563,8 +1535,8 @@ class WebDriver extends Helper {
    *
    */
   async seeInSource(text) {
-    const source = await this.browser.getPageSource()
-    return stringIncludes('HTML source of a page').assert(text, source)
+    const source = await this.browser.getPageSource();
+    return stringIncludes('HTML source of a page').assert(text, source);
   }
 
   /**
@@ -1572,7 +1544,7 @@ class WebDriver extends Helper {
    *
    */
   async grabSource() {
-    return this.browser.getPageSource()
+    return this.browser.getPageSource();
   }
 
   /**
@@ -1580,27 +1552,27 @@ class WebDriver extends Helper {
    */
   async grabBrowserLogs() {
     if (this.browser.isW3C) {
-      this.debug('Logs not available in W3C specification')
-      return
+      this.debug('Logs not available in W3C specification');
+      return;
     }
-    return this.browser.getLogs('browser')
+    return this.browser.getLogs('browser');
   }
 
   /**
    * {{> grabCurrentUrl }}
    */
   async grabCurrentUrl() {
-    const res = await this.browser.getUrl()
-    this.debugSection('Url', res)
-    return res
+    const res = await this.browser.getUrl();
+    this.debugSection('Url', res);
+    return res;
   }
 
   /**
    * {{> dontSeeInSource }}
    */
   async dontSeeInSource(text) {
-    const source = await this.browser.getPageSource()
-    return stringIncludes('HTML source of a page').negate(text, source)
+    const source = await this.browser.getPageSource();
+    return stringIncludes('HTML source of a page').negate(text, source);
   }
 
   /**
@@ -1608,12 +1580,8 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async seeNumberOfElements(locator, num) {
-    const res = await this._locate(locator)
-    return assert.equal(
-      res.length,
-      num,
-      `expected number of elements (${new Locator(locator)}) is ${num}, but found ${res.length}`,
-    )
+    const res = await this._locate(locator);
+    return assert.equal(res.length, num, `expected number of elements (${(new Locator(locator))}) is ${num}, but found ${res.length}`);
   }
 
   /**
@@ -1621,93 +1589,86 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async seeNumberOfVisibleElements(locator, num) {
-    const res = await this.grabNumberOfVisibleElements(locator)
-    return assert.equal(
-      res,
-      num,
-      `expected number of visible elements (${new Locator(locator)}) is ${num}, but found ${res}`,
-    )
+    const res = await this.grabNumberOfVisibleElements(locator);
+    return assert.equal(res, num, `expected number of visible elements (${(new Locator(locator))}) is ${num}, but found ${res}`);
   }
 
   /**
    * {{> seeCssPropertiesOnElements }}
    */
   async seeCssPropertiesOnElements(locator, cssProperties) {
-    const res = await this._locate(locator)
-    assertElementExists(res, locator)
+    const res = await this._locate(locator);
+    assertElementExists(res, locator);
 
-    const cssPropertiesCamelCase = convertCssPropertiesToCamelCase(cssProperties)
-    const elemAmount = res.length
-    let props = []
+    const cssPropertiesCamelCase = convertCssPropertiesToCamelCase(cssProperties);
+    const elemAmount = res.length;
+    let props = [];
 
     for (const element of res) {
       for (const prop of Object.keys(cssProperties)) {
-        const cssProp = await this.grabCssPropertyFrom(locator, prop)
+        const cssProp = await this.grabCssPropertyFrom(locator, prop);
         if (isColorProperty(prop)) {
-          props.push(convertColorToRGBA(cssProp))
+          props.push(convertColorToRGBA(cssProp));
         } else {
-          props.push(cssProp)
+          props.push(cssProp);
         }
       }
     }
 
-    const values = Object.keys(cssPropertiesCamelCase).map((key) => cssPropertiesCamelCase[key])
-    if (!Array.isArray(props)) props = [props]
-    let chunked = chunkArray(props, values.length)
+    const values = Object.keys(cssPropertiesCamelCase).map(key => cssPropertiesCamelCase[key]);
+    if (!Array.isArray(props)) props = [props];
+    let chunked = chunkArray(props, values.length);
     chunked = chunked.filter((val) => {
       for (let i = 0; i < val.length; ++i) {
         // eslint-disable-next-line eqeqeq
-        if (val[i] != values[i]) return false
+        if (val[i] != values[i]) return false;
       }
-      return true
-    })
-    return equals(
-      `all elements (${new Locator(locator)}) to have CSS property ${JSON.stringify(cssProperties)}`,
-    ).assert(chunked.length, elemAmount)
+      return true;
+    });
+    return equals(`all elements (${(new Locator(locator))}) to have CSS property ${JSON.stringify(cssProperties)}`).assert(chunked.length, elemAmount);
   }
 
   /**
    * {{> seeAttributesOnElements }}
    */
   async seeAttributesOnElements(locator, attributes) {
-    const res = await this._locate(locator)
-    assertElementExists(res, locator)
-    const elemAmount = res.length
+    const res = await this._locate(locator);
+    assertElementExists(res, locator);
+    const elemAmount = res.length;
 
     let attrs = await forEachAsync(res, async (el) => {
-      return forEachAsync(Object.keys(attributes), async (attr) => el.getAttribute(attr))
-    })
+      return forEachAsync(Object.keys(attributes), async attr => el.getAttribute(attr));
+    });
 
-    const values = Object.keys(attributes).map((key) => attributes[key])
-    if (!Array.isArray(attrs)) attrs = [attrs]
-    let chunked = chunkArray(attrs, values.length)
+    const values = Object.keys(attributes).map(key => attributes[key]);
+    if (!Array.isArray(attrs)) attrs = [attrs];
+    let chunked = chunkArray(attrs, values.length);
     chunked = chunked.filter((val) => {
       for (let i = 0; i < val.length; ++i) {
-        const _actual = Number.isNaN(val[i]) || typeof values[i] === 'string' ? val[i] : Number.parseInt(val[i], 10)
-        const _expected =
-          Number.isNaN(values[i]) || typeof values[i] === 'string' ? values[i] : Number.parseInt(values[i], 10)
+        const _actual = Number.isNaN(val[i]) || (typeof values[i]) === 'string' ? val[i] : Number.parseInt(val[i], 10);
+        const _expected = Number.isNaN(values[i]) || (typeof values[i]) === 'string' ? values[i] : Number.parseInt(values[i], 10);
         // the attribute could be a boolean
-        if (typeof _actual === 'boolean') return _actual === _expected
-        if (_actual !== _expected) return false
+        if (typeof _actual === 'boolean') return _actual === _expected;
+        if (_actual !== _expected) return false;
       }
-      return true
-    })
+      return true;
+    });
     return assert.ok(
       chunked.length === elemAmount,
-      `expected all elements (${new Locator(locator)}) to have attributes ${JSON.stringify(attributes)}`,
-    )
+      `expected all elements (${(new Locator(locator))}) to have attributes ${JSON.stringify(attributes)}`,
+    );
   }
 
   /**
    * {{> grabNumberOfVisibleElements }}
    */
   async grabNumberOfVisibleElements(locator) {
-    const res = await this._locate(locator)
+    const res = await this._locate(locator);
 
-    let selected = await forEachAsync(res, async (el) => el.isDisplayed())
-    if (!Array.isArray(selected)) selected = [selected]
-    selected = selected.filter((val) => val === true)
-    return selected.length
+    let selected = await forEachAsync(res, async el => el.isDisplayed());
+    if (!Array.isArray(selected)) selected = [selected];
+    selected = selected.filter(val => val === true);
+    return selected.length;
   }
 
   /**
@@ -1715,8 +1676,8 @@ class WebDriver extends Helper {
    *
    */
   async seeInCurrentUrl(url) {
-    const res = await this.browser.getUrl()
-    return stringIncludes('url').assert(url, decodeUrl(res))
+    const res = await this.browser.getUrl();
+    return stringIncludes('url').assert(url, decodeUrl(res));
   }
 
   /**
@@ -1724,8 +1685,8 @@ class WebDriver extends Helper {
    *
    */
   async dontSeeInCurrentUrl(url) {
-    const res = await this.browser.getUrl()
-    return stringIncludes('url').negate(url, decodeUrl(res))
+    const res = await this.browser.getUrl();
+    return stringIncludes('url').negate(url, decodeUrl(res));
   }
 
   /**
@@ -1733,8 +1694,8 @@ class WebDriver extends Helper {
    *
    */
   async seeCurrentUrlEquals(url) {
-    const res = await this.browser.getUrl()
-    return urlEquals(this.options.url).assert(url, decodeUrl(res))
+    const res = await this.browser.getUrl();
+    return urlEquals(this.options.url).assert(url, decodeUrl(res));
   }
 
   /**
@@ -1742,8 +1703,8 @@ class WebDriver extends Helper {
    *
    */
   async dontSeeCurrentUrlEquals(url) {
-    const res = await this.browser.getUrl()
-    return urlEquals(this.options.url).negate(url, decodeUrl(res))
+    const res = await this.browser.getUrl();
+    return urlEquals(this.options.url).negate(url, decodeUrl(res));
   }
 
   /**
@@ -1752,7 +1713,7 @@ class WebDriver extends Helper {
    * {{> executeScript }}
    */
   executeScript(...args) {
-    return this.browser.execute.apply(this.browser, args)
+    return this.browser.execute.apply(this.browser, args);
   }
 
   /**
@@ -1760,7 +1721,7 @@ class WebDriver extends Helper {
    *
    */
   executeAsyncScript(...args) {
-    return this.browser.executeAsync.apply(this.browser, args)
+    return this.browser.executeAsync.apply(this.browser, args);
   }
 
   /**
@@ -1768,10 +1729,10 @@ class WebDriver extends Helper {
    *
    */
   async scrollIntoView(locator, scrollIntoViewOptions) {
-    const res = await this._locate(withStrictLocator(locator), true)
-    assertElementExists(res, locator)
-    const elem = usingFirstElement(res)
-    return elem.scrollIntoView(scrollIntoViewOptions)
+    const res = await this._locate(withStrictLocator(locator), true);
+    assertElementExists(res, locator);
+    const elem = usingFirstElement(res);
+    return elem.scrollIntoView(scrollIntoViewOptions);
   }
 
   /**
@@ -1780,40 +1741,28 @@ class WebDriver extends Helper {
    */
   async scrollTo(locator, offsetX = 0, offsetY = 0) {
     if (typeof locator === 'number' && typeof offsetX === 'number') {
-      offsetY = offsetX
-      offsetX = locator
-      locator = null
+      offsetY = offsetX;
+      offsetX = locator;
+      locator = null;
     }
 
     if (locator) {
-      const res = await this._locate(withStrictLocator(locator), true)
-      assertElementExists(res, locator)
-      const elem = usingFirstElement(res)
-      const elementId = getElementId(elem)
-      if (this.browser.isMobile && !this.browser.isW3C) return this.browser.touchScroll(offsetX, offsetY, elementId)
-      const location = await elem.getLocation()
-      assertElementExists(location, locator, 'Failed to receive', 'location')
+      const res = await this._locate(withStrictLocator(locator), true);
+      assertElementExists(res, locator);
+      const elem = usingFirstElement(res);
+      const elementId = getElementId(elem);
+      if (this.browser.isMobile && !this.browser.isW3C) return this.browser.touchScroll(offsetX, offsetY, elementId);
+      const location = await elem.getLocation();
+      assertElementExists(location, locator, 'Failed to receive', 'location');
       /* eslint-disable prefer-arrow-callback */
-      return this.browser.execute(
-        function (x, y) {
-          return window.scrollTo(x, y)
-        },
-        location.x + offsetX,
-        location.y + offsetY,
-      )
+      return this.browser.execute(function (x, y) { return window.scrollTo(x, y); }, location.x + offsetX, location.y + offsetY);
       /* eslint-enable */
     }
 
-    if (this.browser.isMobile && !this.browser.isW3C) return this.browser.touchScroll(locator, offsetX, offsetY)
+    if (this.browser.isMobile && !this.browser.isW3C) return this.browser.touchScroll(locator, offsetX, offsetY);
 
     /* eslint-disable prefer-arrow-callback, comma-dangle */
-    return this.browser.execute(
-      function (x, y) {
-        return window.scrollTo(x, y)
-      },
-      offsetX,
-      offsetY,
-    )
+    return this.browser.execute(function (x, y) { return window.scrollTo(x, y); }, offsetX, offsetY);
     /* eslint-enable */
   }
 
@@ -1821,13 +1770,13 @@ class WebDriver extends Helper {
    * {{> moveCursorTo }}
    */
   async moveCursorTo(locator, xOffset, yOffset) {
-    const res = await this._locate(withStrictLocator(locator), true)
-    assertElementExists(res, locator)
-    const elem = usingFirstElement(res)
+    const res = await this._locate(withStrictLocator(locator), true);
+    assertElementExists(res, locator);
+    const elem = usingFirstElement(res);
     try {
-      await elem.moveTo({ xOffset, yOffset })
+      await elem.moveTo({ xOffset, yOffset });
     } catch (e) {
-      debug(e.message)
+      debug(e.message);
     }
   }
 
@@ -1836,63 +1785,54 @@ class WebDriver extends Helper {
    *
    */
   async saveElementScreenshot(locator, fileName) {
-    const outputFile = screenshotOutputFolder(fileName)
+    const outputFile = screenshotOutputFolder(fileName);
 
-    const res = await this._locate(withStrictLocator(locator), true)
-    assertElementExists(res, locator)
-    const elem = usingFirstElement(res)
+    const res = await this._locate(withStrictLocator(locator), true);
+    assertElementExists(res, locator);
+    const elem = usingFirstElement(res);
 
-    this.debug(`Screenshot of ${new Locator(locator)} element has been saved to ${outputFile}`)
-    return elem.saveScreenshot(outputFile)
+    this.debug(`Screenshot of ${(new Locator(locator))} element has been saved to ${outputFile}`);
+    return elem.saveScreenshot(outputFile);
   }
 
   /**
    * {{> saveScreenshot }}
    */
   async saveScreenshot(fileName, fullPage = false) {
-    let outputFile = screenshotOutputFolder(fileName)
+    const outputFile = screenshotOutputFolder(fileName);
 
     if (this.activeSessionName) {
-      const browser = this.sessionWindows[this.activeSessionName]
-
-      for (const sessionName in this.sessionWindows) {
-        const activeSessionPage = this.sessionWindows[sessionName]
-        outputFile = screenshotOutputFolder(`${sessionName}_${fileName}`)
+      const browser = this.sessionWindows[this.activeSessionName];
 
-        this.debug(`${sessionName} - Screenshot is saving to ${outputFile}`)
-
-        if (browser) {
-          this.debug(`Screenshot of ${sessionName} session has been saved to ${outputFile}`)
-          return browser.saveScreenshot(outputFile)
-        }
+      if (browser) {
+        this.debug(`Screenshot of ${this.activeSessionName} session has been saved to ${outputFile}`);
+        return browser.saveScreenshot(outputFile);
       }
     }
 
     if (!fullPage) {
-      this.debug(`Screenshot has been saved to ${outputFile}`)
-      return this.browser.saveScreenshot(outputFile)
+      this.debug(`Screenshot has been saved to ${outputFile}`);
+      return this.browser.saveScreenshot(outputFile);
     }
 
     /* eslint-disable prefer-arrow-callback, comma-dangle, prefer-const */
-    const originalWindowSize = await this.browser.getWindowSize()
+    const originalWindowSize = await this.browser.getWindowSize();
 
-    let { width, height } = await this.browser
-      .execute(function () {
-        return {
-          height: document.body.scrollHeight,
-          width: document.body.scrollWidth,
-        }
-      })
-      .then((res) => res)
+    let { width, height } = await this.browser.execute(function () {
+      return {
+        height: document.body.scrollHeight,
+        width: document.body.scrollWidth
+      };
+    }).then(res => res);
 
-    if (height < 100) height = 500 // errors for very small height
+    if (height < 100) height = 500; // errors for very small height
     /* eslint-enable */
 
-    await this.browser.setWindowSize(width, height)
-    this.debug(`Screenshot has been saved to ${outputFile}, size: ${width}x${height}`)
-    const buffer = await this.browser.saveScreenshot(outputFile)
-    await this.browser.setWindowSize(originalWindowSize.width, originalWindowSize.height)
-    return buffer
+    await this.browser.setWindowSize(width, height);
+    this.debug(`Screenshot has been saved to ${outputFile}, size: ${width}x${height}`);
+    const buffer = await this.browser.saveScreenshot(outputFile);
+    await this.browser.setWindowSize(originalWindowSize.width, originalWindowSize.height);
+    return buffer;
   }
 
   /**
@@ -1900,40 +1840,40 @@ class WebDriver extends Helper {
    * {{> setCookie }}
    */
   async setCookie(cookie) {
-    return this.browser.setCookies(cookie)
+    return this.browser.setCookies(cookie);
   }
 
   /**
    * {{> clearCookie }}
    */
   async clearCookie(cookie) {
-    return this.browser.deleteCookies(cookie)
+    return this.browser.deleteCookies(cookie);
   }
 
   /**
    * {{> seeCookie }}
    */
   async seeCookie(name) {
-    const cookie = await this.browser.getCookies([name])
-    return truth(`cookie ${name}`, 'to be set').assert(cookie)
+    const cookie = await this.browser.getCookies([name]);
+    return truth(`cookie ${name}`, 'to be set').assert(cookie);
   }
 
   /**
    * {{> dontSeeCookie }}
    */
   async dontSeeCookie(name) {
-    const cookie = await this.browser.getCookies([name])
-    return truth(`cookie ${name}`, 'to be set').negate(cookie)
+    const cookie = await this.browser.getCookies([name]);
+    return truth(`cookie ${name}`, 'to be set').negate(cookie);
   }
 
   /**
    * {{> grabCookie }}
    */
   async grabCookie(name) {
-    if (!name) return this.browser.getCookies()
-    const cookie = await this.browser.getCookies([name])
-    this.debugSection('Cookie', JSON.stringify(cookie))
-    return cookie[0]
+    if (!name) return this.browser.getCookies();
+    const cookie = await this.browser.getCookies([name]);
+    this.debugSection('Cookie', JSON.stringify(cookie));
+    return cookie[0];
   }
 
   /**
@@ -1941,33 +1881,30 @@ class WebDriver extends Helper {
    */
   async waitForCookie(name, sec) {
     // by default, we will retry 3 times
-    let retries = 3
-    const waitTimeout = sec || this.options.waitForTimeoutInSeconds
+    let retries = 3;
+    const waitTimeout = sec || this.options.waitForTimeoutInSeconds;
 
     if (sec) {
-      retries = sec
+      retries = sec;
     } else {
-      retries = waitTimeout - 1
+      retries = waitTimeout - 1;
     }
 
-    return promiseRetry(
-      async (retry, number) => {
-        const _grabCookie = async (name) => {
-          const cookie = await this.browser.getCookies([name])
-          if (cookie.length === 0) throw Error(`Cookie ${name} is not found after ${retries}s`)
-        }
+    return promiseRetry(async (retry, number) => {
+      const _grabCookie = async (name) => {
+        const cookie = await this.browser.getCookies([name]);
+        if (cookie.length === 0) throw Error(`Cookie ${name} is not found after ${retries}s`);
+      };
 
-        this.debugSection('Wait for cookie: ', name)
-        if (number > 1) this.debugSection('Retrying... Attempt #', number)
+      this.debugSection('Wait for cookie: ', name);
+      if (number > 1) this.debugSection('Retrying... Attempt #', number);
 
-        try {
-          await _grabCookie(name)
-        } catch (e) {
-          retry(e)
-        }
-      },
-      { retries, maxTimeout: 1000 },
-    )
+      try {
+        await _grabCookie(name);
+      } catch (e) {
+        retry(e);
+      }
+    }, { retries, maxTimeout: 1000 });
   }
 
   /**
@@ -1978,9 +1915,9 @@ class WebDriver extends Helper {
   async acceptPopup() {
     return this.browser.getAlertText().then((res) => {
       if (res !== null) {
-        return this.browser.acceptAlert()
+        return this.browser.acceptAlert();
       }
-    })
+    });
   }
 
   /**
@@ -1990,9 +1927,9 @@ class WebDriver extends Helper {
   async cancelPopup() {
     return this.browser.getAlertText().then((res) => {
       if (res !== null) {
-        return this.browser.dismissAlert()
+        return this.browser.dismissAlert();
       }
-    })
+    });
   }
 
   /**
@@ -2004,10 +1941,10 @@ class WebDriver extends Helper {
   async seeInPopup(text) {
     return this.browser.getAlertText().then((res) => {
       if (res === null) {
-        throw new Error('Popup is not opened')
+        throw new Error('Popup is not opened');
       }
-      stringIncludes('text in popup').assert(text, res)
-    })
+      stringIncludes('text in popup').assert(text, res);
+    });
   }
 
   /**
@@ -2015,9 +1952,9 @@ class WebDriver extends Helper {
    */
   async grabPopupText() {
     try {
-      return await this.browser.getAlertText()
+      return await this.browser.getAlertText();
     } catch (err) {
-      this.debugSection('Popup', 'Error getting text from popup')
+      this.debugSection('Popup', 'Error getting text from popup');
     }
   }
 
@@ -2025,44 +1962,36 @@ class WebDriver extends Helper {
    * {{> pressKeyDown }}
    */
   async pressKeyDown(key) {
-    key = getNormalizedKey.call(this, key)
+    key = getNormalizedKey.call(this, key);
     if (!this.browser.isW3C) {
-      return this.browser.sendKeys([key])
+      return this.browser.sendKeys([key]);
     }
-    return this.browser.performActions([
-      {
-        type: 'key',
-        id: 'keyboard',
-        actions: [
-          {
-            type: 'keyDown',
-            value: key,
-          },
-        ],
-      },
-    ])
+    return this.browser.performActions([{
+      type: 'key',
+      id: 'keyboard',
+      actions: [{
+        type: 'keyDown',
+        value: key,
+      }],
+    }]);
   }
 
   /**
    * {{> pressKeyUp }}
    */
   async pressKeyUp(key) {
-    key = getNormalizedKey.call(this, key)
+    key = getNormalizedKey.call(this, key);
     if (!this.browser.isW3C) {
-      return this.browser.sendKeys([key])
+      return this.browser.sendKeys([key]);
     }
-    return this.browser.performActions([
-      {
-        type: 'key',
-        id: 'keyboard',
-        actions: [
-          {
-            type: 'keyUp',
-            value: key,
-          },
-        ],
-      },
-    ])
+    return this.browser.performActions([{
+      type: 'key',
+      id: 'keyboard',
+      actions: [{
+        type: 'keyUp',
+        value: key,
+      }],
+    }]);
   }
 
   /**
@@ -2071,45 +2000,40 @@ class WebDriver extends Helper {
    * {{> pressKeyWithKeyNormalization }}
    */
   async pressKey(key) {
-    const modifiers = []
+    const modifiers = [];
     if (Array.isArray(key)) {
       for (let k of key) {
-        k = getNormalizedKey.call(this, k)
+        k = getNormalizedKey.call(this, k);
         if (isModifierKey(k)) {
-          modifiers.push(k)
+          modifiers.push(k);
         } else {
-          key = k
-          break
+          key = k;
+          break;
         }
       }
     } else {
-      key = getNormalizedKey.call(this, key)
+      key = getNormalizedKey.call(this, key);
     }
     for (const modifier of modifiers) {
-      await this.pressKeyDown(modifier)
+      await this.pressKeyDown(modifier);
     }
     if (!this.browser.isW3C) {
-      await this.browser.sendKeys([key])
+      await this.browser.sendKeys([key]);
     } else {
-      await this.browser.performActions([
-        {
-          type: 'key',
-          id: 'keyboard',
-          actions: [
-            {
-              type: 'keyDown',
-              value: key,
-            },
-            {
-              type: 'keyUp',
-              value: key,
-            },
-          ],
-        },
-      ])
+      await this.browser.performActions([{
+        type: 'key',
+        id: 'keyboard',
+        actions: [{
+          type: 'keyDown',
+          value: key,
+        }, {
+          type: 'keyUp',
+          value: key,
+        }],
+      }]);
     }
     for (const modifier of modifiers) {
-      await this.pressKeyUp(modifier)
+      await this.pressKeyUp(modifier);
     }
   }
 
@@ -2118,17 +2042,17 @@ class WebDriver extends Helper {
    */
   async type(keys, delay = null) {
     if (!Array.isArray(keys)) {
-      keys = keys.toString()
-      keys = keys.split('')
+      keys = keys.toString();
+      keys = keys.split('');
     }
     if (delay) {
       for (const key of keys) {
-        await this.browser.keys(key)
-        await this.wait(delay / 1000)
+        await this.browser.keys(key);
+        await this.wait(delay / 1000);
       }
-      return
+      return;
     }
-    await this.browser.keys(keys)
+    await this.browser.keys(keys);
   }
 
   /**
@@ -2137,27 +2061,27 @@ class WebDriver extends Helper {
    * {{> resizeWindow }}
    */
   async resizeWindow(width, height) {
-    return this.browser.setWindowSize(width, height)
+    return this.browser.setWindowSize(width, height);
   }
 
   async _resizeBrowserWindow(browser, width, height) {
     if (width === 'maximize') {
-      const size = await browser.maximizeWindow()
-      this.debugSection('Window Size', size)
-      return
+      const size = await browser.maximizeWindow();
+      this.debugSection('Window Size', size);
+      return;
     }
     if (browser.isW3C) {
-      return browser.setWindowRect(null, null, parseInt(width, 10), parseInt(height, 10))
+      return browser.setWindowRect(null, null, parseInt(width, 10), parseInt(height, 10));
     }
-    return browser.setWindowSize(parseInt(width, 10), parseInt(height, 10))
+    return browser.setWindowSize(parseInt(width, 10), parseInt(height, 10));
   }
 
   async _resizeWindowIfNeeded(browser, windowSize) {
     if (this.isWeb && windowSize === 'maximize') {
-      await this._resizeBrowserWindow(browser, 'maximize')
+      await this._resizeBrowserWindow(browser, 'maximize');
     } else if (this.isWeb && windowSize && windowSize.indexOf('x') > 0) {
-      const dimensions = windowSize.split('x')
-      await this._resizeBrowserWindow(browser, dimensions[0], dimensions[1])
+      const dimensions = windowSize.split('x');
+      await this._resizeBrowserWindow(browser, dimensions[0], dimensions[1]);
     }
   }
 
@@ -2166,11 +2090,11 @@ class WebDriver extends Helper {
    *
    */
   async focus(locator) {
-    const els = await this._locate(locator)
-    assertElementExists(els, locator, 'Element to focus')
-    const el = usingFirstElement(els)
+    const els = await this._locate(locator);
+    assertElementExists(els, locator, 'Element to focus');
+    const el = usingFirstElement(els);
 
-    await focusElement(el, this.browser)
+    await focusElement(el, this.browser);
   }
 
   /**
@@ -2178,11 +2102,11 @@ class WebDriver extends Helper {
    *
    */
   async blur(locator) {
-    const els = await this._locate(locator)
-    assertElementExists(els, locator, 'Element to blur')
-    const el = usingFirstElement(els)
+    const els = await this._locate(locator);
+    assertElementExists(els, locator, 'Element to blur');
+    const el = usingFirstElement(els);
 
-    await blurElement(el, this.browser)
+    await blurElement(el, this.browser);
   }
 
   /**
@@ -2190,73 +2114,64 @@ class WebDriver extends Helper {
    * {{> dragAndDrop }}
    */
   async dragAndDrop(srcElement, destElement) {
-    let sourceEl = await this._locate(srcElement)
-    assertElementExists(sourceEl, srcElement)
-    sourceEl = usingFirstElement(sourceEl)
+    let sourceEl = await this._locate(srcElement);
+    assertElementExists(sourceEl, srcElement);
+    sourceEl = usingFirstElement(sourceEl);
 
-    let destEl = await this._locate(destElement)
-    assertElementExists(destEl, destElement)
-    destEl = usingFirstElement(destEl)
+    let destEl = await this._locate(destElement);
+    assertElementExists(destEl, destElement);
+    destEl = usingFirstElement(destEl);
 
-    return sourceEl.dragAndDrop(destEl)
+    return sourceEl.dragAndDrop(destEl);
   }
 
   /**
    * {{> dragSlider }}
    */
   async dragSlider(locator, offsetX = 0) {
-    const browser = this.browser
-    await this.moveCursorTo(locator)
+    const browser = this.browser;
+    await this.moveCursorTo(locator);
 
     // for chrome
     if (browser.isW3C) {
-      const xOffset = await this.grabElementBoundingRect(locator, 'x')
-      const yOffset = await this.grabElementBoundingRect(locator, 'y')
-
-      return browser.performActions([
-        {
-          type: 'pointer',
-          id: 'pointer1',
-          parameters: { pointerType: 'mouse' },
-          actions: [
-            {
-              type: 'pointerMove',
-              origin: 'pointer',
-              duration: 1000,
-              x: xOffset,
-              y: yOffset,
-            },
-            { type: 'pointerDown', button: 0 },
-            {
-              type: 'pointerMove',
-              origin: 'pointer',
-              duration: 1000,
-              x: offsetX,
-              y: 0,
-            },
-            { type: 'pointerUp', button: 0 },
-          ],
-        },
-      ])
-    }
-
-    await browser.buttonDown(0)
-    await browser.moveToElement(null, offsetX, 0)
-    await browser.buttonUp(0)
+      const xOffset = await this.grabElementBoundingRect(locator, 'x');
+      const yOffset = await this.grabElementBoundingRect(locator, 'y');
+
+      return browser.performActions([{
+        type: 'pointer',
+        id: 'pointer1',
+        parameters: { pointerType: 'mouse' },
+        actions: [
+          {
+            type: 'pointerMove', origin: 'pointer', duration: 1000, x: xOffset, y: yOffset,
+          },
+          { type: 'pointerDown', button: 0 },
+          {
+            type: 'pointerMove', origin: 'pointer', duration: 1000, x: offsetX, y: 0,
+          },
+          { type: 'pointerUp', button: 0 },
+        ],
+      },
+      ]);
+    }
+
+    await browser.buttonDown(0);
+    await browser.moveToElement(null, offsetX, 0);
+    await browser.buttonUp(0);
   }
 
   /**
    * {{> grabAllWindowHandles }}
    */
   async grabAllWindowHandles() {
-    return this.browser.getWindowHandles()
+    return this.browser.getWindowHandles();
   }
 
   /**
    * {{> grabCurrentWindowHandle }}
    */
   async grabCurrentWindowHandle() {
-    return this.browser.getWindowHandle()
+    return this.browser.getWindowHandle();
   }
 
   /**
@@ -2274,140 +2189,125 @@ class WebDriver extends Helper {
    * @param {string} window name of window handle.
    */
   async switchToWindow(window) {
-    await this.browser.switchToWindow(window)
+    await this.browser.switchToWindow(window);
   }
 
   /**
    * {{> closeOtherTabs }}
    */
   async closeOtherTabs() {
-    const handles = await this.browser.getWindowHandles()
-    const currentHandle = await this.browser.getWindowHandle()
-    const otherHandles = handles.filter((handle) => handle !== currentHandle)
+    const handles = await this.browser.getWindowHandles();
+    const currentHandle = await this.browser.getWindowHandle();
+    const otherHandles = handles.filter(handle => handle !== currentHandle);
 
     await forEachAsync(otherHandles, async (handle) => {
-      await this.browser.switchToWindow(handle)
-      await this.browser.closeWindow()
-    })
-    await this.browser.switchToWindow(currentHandle)
+      await this.browser.switchToWindow(handle);
+      await this.browser.closeWindow();
+    });
+    await this.browser.switchToWindow(currentHandle);
   }
 
   /**
    * {{> wait }}
    */
   async wait(sec) {
-    return new Promise((resolve) => {
-      setTimeout(resolve, sec * 1000)
-    })
+    return new Promise(resolve => {
+      setTimeout(resolve, sec * 1000);
+    });
   }
 
   /**
    * {{> waitForEnabled }}
    */
   async waitForEnabled(locator, sec = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
 
-    return this.browser.waitUntil(
-      async () => {
-        const res = await this._res(locator)
-        if (!res || res.length === 0) {
-          return false
-        }
-        const selected = await forEachAsync(res, async (el) => this.browser.isElementEnabled(getElementId(el)))
-        if (Array.isArray(selected)) {
-          return selected.filter((val) => val === true).length > 0
-        }
-        return selected
-      },
-      {
-        timeout: aSec * 1000,
-        timeoutMsg: `element (${new Locator(locator)}) still not enabled after ${aSec} sec`,
-      },
-    )
+    return this.browser.waitUntil(async () => {
+      const res = await this._res(locator);
+      if (!res || res.length === 0) {
+        return false;
+      }
+      const selected = await forEachAsync(res, async el => this.browser.isElementEnabled(getElementId(el)));
+      if (Array.isArray(selected)) {
+        return selected.filter(val => val === true).length > 0;
+      }
+      return selected;
+    }, {
+      timeout: aSec * 1000,
+      timeoutMsg: `element (${new Locator(locator)}) still not enabled after ${aSec} sec`,
+    });
   }
 
   /**
    * {{> waitForElement }}
    */
   async waitForElement(locator, sec = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
 
-    return this.browser.waitUntil(
-      async () => {
-        const res = await this._res(locator)
-        return res && res.length
-      },
-      {
-        timeout: aSec * 1000,
-        timeoutMsg: `element (${new Locator(locator)}) still not present on page after ${aSec} sec`,
-      },
-    )
+    return this.browser.waitUntil(async () => {
+      const res = await this._res(locator);
+      return res && res.length;
+    }, { timeout: aSec * 1000, timeoutMsg: `element (${(new Locator(locator))}) still not present on page after ${aSec} sec` });
   }
 
   /**
    * {{> waitForClickable }}
    */
   async waitForClickable(locator, waitTimeout) {
-    waitTimeout = waitTimeout || this.options.waitForTimeoutInSeconds
-    let res = await this._locate(locator)
-    res = usingFirstElement(res)
-    assertElementExists(res, locator)
+    waitTimeout = waitTimeout || this.options.waitForTimeoutInSeconds;
+    let res = await this._locate(locator);
+    res = usingFirstElement(res);
+    assertElementExists(res, locator);
 
     return res.waitForClickable({
       timeout: waitTimeout * 1000,
       timeoutMsg: `element ${res.selector} still not clickable after ${waitTimeout} sec`,
-    })
+    });
   }
 
   /**
    * {{> waitInUrl }}
    */
   async waitInUrl(urlPart, sec = null) {
-    const client = this.browser
-    const aSec = sec || this.options.waitForTimeoutInSeconds
-    let currUrl = ''
+    const client = this.browser;
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
+    let currUrl = '';
 
     return client
-      .waitUntil(
-        function () {
-          return this.getUrl().then((res) => {
-            currUrl = decodeUrl(res)
-            return currUrl.indexOf(urlPart) > -1
-          })
-        },
-        { timeout: aSec * 1000 },
-      )
-      .catch((e) => {
+      .waitUntil(function () {
+        return this.getUrl().then((res) => {
+          currUrl = decodeUrl(res);
+          return currUrl.indexOf(urlPart) > -1;
+        });
+      }, { timeout: aSec * 1000 }).catch((e) => {
         if (e.message.indexOf('timeout')) {
-          throw new Error(`expected url to include ${urlPart}, but found ${currUrl}`)
+          throw new Error(`expected url to include ${urlPart}, but found ${currUrl}`);
         }
-        throw e
-      })
+        throw e;
+      });
   }
 
   /**
    * {{> waitUrlEquals }}
    */
   async waitUrlEquals(urlPart, sec = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
-    const baseUrl = this.options.url
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
+    const baseUrl = this.options.url;
     if (urlPart.indexOf('http') < 0) {
-      urlPart = baseUrl + urlPart
-    }
-    let currUrl = ''
-    return this.browser
-      .waitUntil(function () {
-        return this.getUrl().then((res) => {
-          currUrl = decodeUrl(res)
-          return currUrl === urlPart
-        })
-      }, aSec * 1000)
-      .catch((e) => {
-        if (e.message.indexOf('timeout')) {
-          throw new Error(`expected url to be ${urlPart}, but found ${currUrl}`)
-        }
-        throw e
-      })
+      urlPart = baseUrl + urlPart;
+    }
+    let currUrl = '';
+    return this.browser.waitUntil(function () {
+      return this.getUrl().then((res) => {
+        currUrl = decodeUrl(res);
+        return currUrl === urlPart;
+      });
+    }, aSec * 1000).catch((e) => {
+      if (e.message.indexOf('timeout')) {
+        throw new Error(`expected url to be ${urlPart}, but found ${currUrl}`);
+      }
+      throw e;
+    });
   }
 
   /**
@@ -2415,48 +2315,42 @@ class WebDriver extends Helper {
    *
    */
   async waitForText(text, sec = null, context = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
-    const _context = context || this.root
-
-    return this.browser.waitUntil(
-      async () => {
-        const res = await this.$$(withStrictLocator.call(this, _context))
-        if (!res || res.length === 0) return false
-        const selected = await forEachAsync(res, async (el) => this.browser.getElementText(getElementId(el)))
-        if (Array.isArray(selected)) {
-          return selected.filter((part) => part.indexOf(text) >= 0).length > 0
-        }
-        return selected.indexOf(text) >= 0
-      },
-      {
-        timeout: aSec * 1000,
-        timeoutMsg: `element (${_context}) is not in DOM or there is no element(${_context}) with text "${text}" after ${aSec} sec`,
-      },
-    )
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
+    const _context = context || this.root;
+
+    return this.browser.waitUntil(async () => {
+      const res = await this.$$(withStrictLocator.call(this, _context));
+      if (!res || res.length === 0) return false;
+      const selected = await forEachAsync(res, async el => this.browser.getElementText(getElementId(el)));
+      if (Array.isArray(selected)) {
+        return selected.filter(part => part.indexOf(text) >= 0).length > 0;
+      }
+      return selected.indexOf(text) >= 0;
+    }, {
+      timeout: aSec * 1000,
+      timeoutMsg: `element (${_context}) is not in DOM or there is no element(${_context}) with text "${text}" after ${aSec} sec`,
+    });
   }
 
   /**
    * {{> waitForValue }}
    */
   async waitForValue(field, value, sec = null) {
-    const client = this.browser
-    const aSec = sec || this.options.waitForTimeoutInSeconds
-
-    return client.waitUntil(
-      async () => {
-        const res = await findFields.call(this, field)
-        if (!res || res.length === 0) return false
-        const selected = await forEachAsync(res, async (el) => el.getValue())
-        if (Array.isArray(selected)) {
-          return selected.filter((part) => part.indexOf(value) >= 0).length > 0
-        }
-        return selected.indexOf(value) >= 0
-      },
-      {
-        timeout: aSec * 1000,
-        timeoutMsg: `element (${field}) is not in DOM or there is no element(${field}) with value "${value}" after ${aSec} sec`,
-      },
-    )
+    const client = this.browser;
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
+
+    return client.waitUntil(async () => {
+      const res = await findFields.call(this, field);
+      if (!res || res.length === 0) return false;
+      const selected = await forEachAsync(res, async el => el.getValue());
+      if (Array.isArray(selected)) {
+        return selected.filter(part => part.indexOf(value) >= 0).length > 0;
+      }
+      return selected.indexOf(value) >= 0;
+    }, {
+      timeout: aSec * 1000,
+      timeoutMsg: `element (${field}) is not in DOM or there is no element(${field}) with value "${value}" after ${aSec} sec`,
+    });
   }
 
   /**
@@ -2464,241 +2358,214 @@ class WebDriver extends Helper {
    *
    */
   async waitForVisible(locator, sec = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
-
-    return this.browser.waitUntil(
-      async () => {
-        const res = await this._res(locator)
-        if (!res || res.length === 0) return false
-        const selected = await forEachAsync(res, async (el) => el.isDisplayed())
-        if (Array.isArray(selected)) {
-          return selected.filter((val) => val === true).length > 0
-        }
-        return selected
-      },
-      {
-        timeout: aSec * 1000,
-        timeoutMsg: `element (${new Locator(locator)}) still not visible after ${aSec} sec`,
-      },
-    )
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
+
+    return this.browser.waitUntil(async () => {
+      const res = await this._res(locator);
+      if (!res || res.length === 0) return false;
+      const selected = await forEachAsync(res, async el => el.isDisplayed());
+      if (Array.isArray(selected)) {
+        return selected.filter(val => val === true).length > 0;
+      }
+      return selected;
+    }, { timeout: aSec * 1000, timeoutMsg: `element (${new Locator(locator)}) still not visible after ${aSec} sec` });
   }
 
   /**
    * {{> waitNumberOfVisibleElements }}
    */
   async waitNumberOfVisibleElements(locator, num, sec = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
 
-    return this.browser.waitUntil(
-      async () => {
-        const res = await this._res(locator)
-        if (!res || res.length === 0) return false
-        let selected = await forEachAsync(res, async (el) => el.isDisplayed())
+    return this.browser.waitUntil(async () => {
+      const res = await this._res(locator);
+      if (!res || res.length === 0) return false;
+      let selected = await forEachAsync(res, async el => el.isDisplayed());
 
-        if (!Array.isArray(selected)) selected = [selected]
-        selected = selected.filter((val) => val === true)
-        return selected.length === num
-      },
-      {
-        timeout: aSec * 1000,
-        timeoutMsg: `The number of elements (${new Locator(locator)}) is not ${num} after ${aSec} sec`,
-      },
-    )
+      if (!Array.isArray(selected)) selected = [selected];
+      selected = selected.filter(val => val === true);
+      return selected.length === num;
+    }, { timeout: aSec * 1000, timeoutMsg: `The number of elements (${new Locator(locator)}) is not ${num} after ${aSec} sec` });
   }
 
   /**
    * {{> waitForInvisible }}
    */
   async waitForInvisible(locator, sec = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
-
-    return this.browser.waitUntil(
-      async () => {
-        const res = await this._res(locator)
-        if (!res || res.length === 0) return true
-        const selected = await forEachAsync(res, async (el) => el.isDisplayed())
-        return !selected.length
-      },
-      { timeout: aSec * 1000, timeoutMsg: `element (${new Locator(locator)}) still visible after ${aSec} sec` },
-    )
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
+
+    return this.browser.waitUntil(async () => {
+      const res = await this._res(locator);
+      if (!res || res.length === 0) return true;
+      const selected = await forEachAsync(res, async el => el.isDisplayed());
+      return !selected.length;
+    }, { timeout: aSec * 1000, timeoutMsg: `element (${new Locator(locator)}) still visible after ${aSec} sec` });
   }
 
   /**
    * {{> waitToHide }}
    */
   async waitToHide(locator, sec = null) {
-    return this.waitForInvisible(locator, sec)
+    return this.waitForInvisible(locator, sec);
   }
 
   /**
    * {{> waitForDetached }}
    */
   async waitForDetached(locator, sec = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
 
-    return this.browser.waitUntil(
-      async () => {
-        const res = await this._res(locator)
-        if (!res || res.length === 0) {
-          return true
-        }
-        return false
-      },
-      { timeout: aSec * 1000, timeoutMsg: `element (${new Locator(locator)}) still on page after ${aSec} sec` },
-    )
+    return this.browser.waitUntil(async () => {
+      const res = await this._res(locator);
+      if (!res || res.length === 0) {
+        return true;
+      }
+      return false;
+    }, { timeout: aSec * 1000, timeoutMsg: `element (${new Locator(locator)}) still on page after ${aSec} sec` });
   }
 
   /**
    * {{> waitForFunction }}
    */
   async waitForFunction(fn, argsOrSec = null, sec = null) {
-    let args = []
+    let args = [];
     if (argsOrSec) {
       if (Array.isArray(argsOrSec)) {
-        args = argsOrSec
+        args = argsOrSec;
       } else if (typeof argsOrSec === 'number') {
-        sec = argsOrSec
+        sec = argsOrSec;
       }
     }
 
-    const aSec = sec || this.options.waitForTimeoutInSeconds
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
 
-    return this.browser.waitUntil(async () => this.browser.execute(fn, ...args), {
-      timeout: aSec * 1000,
-      timeoutMsg: '',
-    })
+    return this.browser.waitUntil(async () => this.browser.execute(fn, ...args), { timeout: aSec * 1000, timeoutMsg: '' });
   }
 
   /**
    * {{> waitForNumberOfTabs }}
    */
   async waitForNumberOfTabs(expectedTabs, sec) {
-    const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeoutInSeconds
-    let currentTabs
-    let count = 0
+    const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeoutInSeconds;
+    let currentTabs;
+    let count = 0;
 
     do {
-      currentTabs = await this.grabNumberOfOpenTabs()
-      await this.wait(1)
-      count += 1000
-      if (currentTabs >= expectedTabs) return
-    } while (count <= waitTimeout)
+      currentTabs = await this.grabNumberOfOpenTabs();
+      await this.wait(1);
+      count += 1000;
+      if (currentTabs >= expectedTabs) return;
+    } while (count <= waitTimeout);
 
-    throw new Error(`Expected ${expectedTabs} tabs are not met after ${waitTimeout / 1000} sec.`)
+    throw new Error(`Expected ${expectedTabs} tabs are not met after ${waitTimeout / 1000} sec.`);
   }
 
   /**
    * {{> switchTo }}
    */
   async switchTo(locator) {
-    this.browser.isInsideFrame = true
+    this.browser.isInsideFrame = true;
     if (Number.isInteger(locator)) {
       if (this.options.automationProtocol) {
-        return this.browser.switchToFrame(locator + 1)
+        return this.browser.switchToFrame(locator + 1);
       }
-      return this.browser.switchToFrame(locator)
+      return this.browser.switchToFrame(locator);
     }
     if (!locator) {
-      return this.browser.switchToFrame(null)
+      return this.browser.switchToFrame(null);
     }
 
-    let res = await this._locate(locator, true)
-    assertElementExists(res, locator)
-    res = usingFirstElement(res)
-    return this.browser.switchToFrame(res)
+    let res = await this._locate(locator, true);
+    assertElementExists(res, locator);
+    res = usingFirstElement(res);
+    return this.browser.switchToFrame(res);
   }
 
   /**
    * {{> switchToNextTab }}
    */
   async switchToNextTab(num = 1, sec = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
-    let target
-    const current = await this.browser.getWindowHandle()
-
-    await this.browser.waitUntil(
-      async () => {
-        await this.browser.getWindowHandles().then((handles) => {
-          if (handles.indexOf(current) + num + 1 <= handles.length) {
-            target = handles[handles.indexOf(current) + num]
-          }
-        })
-        return target
-      },
-      { timeout: aSec * 1000, timeoutMsg: `There is no ability to switch to next tab with offset ${num}` },
-    )
-    return this.browser.switchToWindow(target)
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
+    let target;
+    const current = await this.browser.getWindowHandle();
+
+    await this.browser.waitUntil(async () => {
+      await this.browser.getWindowHandles().then((handles) => {
+        if (handles.indexOf(current) + num + 1 <= handles.length) {
+          target = handles[handles.indexOf(current) + num];
+        }
+      });
+      return target;
+    }, { timeout: aSec * 1000, timeoutMsg: `There is no ability to switch to next tab with offset ${num}` });
+    return this.browser.switchToWindow(target);
   }
 
   /**
    * {{> switchToPreviousTab }}
    */
   async switchToPreviousTab(num = 1, sec = null) {
-    const aSec = sec || this.options.waitForTimeoutInSeconds
-    const current = await this.browser.getWindowHandle()
-    let target
-
-    await this.browser.waitUntil(
-      async () => {
-        await this.browser.getWindowHandles().then((handles) => {
-          if (handles.indexOf(current) - num > -1) {
-            target = handles[handles.indexOf(current) - num]
-          }
-        })
-        return target
-      },
-      { timeout: aSec * 1000, timeoutMsg: `There is no ability to switch to previous tab with offset ${num}` },
-    )
-    return this.browser.switchToWindow(target)
+    const aSec = sec || this.options.waitForTimeoutInSeconds;
+    const current = await this.browser.getWindowHandle();
+    let target;
+
+    await this.browser.waitUntil(async () => {
+      await this.browser.getWindowHandles().then((handles) => {
+        if (handles.indexOf(current) - num > -1) {
+          target = handles[handles.indexOf(current) - num];
+        }
+      });
+      return target;
+    }, { timeout: aSec * 1000, timeoutMsg: `There is no ability to switch to previous tab with offset ${num}` });
+    return this.browser.switchToWindow(target);
   }
 
   /**
    * {{> closeCurrentTab }}
    */
   async closeCurrentTab() {
-    await this.browser.closeWindow()
-    const handles = await this.browser.getWindowHandles()
-    if (handles[0]) await this.browser.switchToWindow(handles[0])
+    await this.browser.closeWindow();
+    const handles = await this.browser.getWindowHandles();
+    if (handles[0]) await this.browser.switchToWindow(handles[0]);
   }
 
   /**
    * {{> openNewTab }}
    */
   async openNewTab(url = 'about:blank', windowName = null) {
-    const client = this.browser
-    const crypto = require('crypto')
+    const client = this.browser;
+    const crypto = require('crypto');
     if (windowName == null) {
-      windowName = crypto.randomBytes(32).toString('hex')
+      windowName = crypto.randomBytes(32).toString('hex');
     }
-    return client.newWindow(url, windowName)
+    return client.newWindow(url, windowName);
   }
 
   /**
    * {{> grabNumberOfOpenTabs }}
    */
   async grabNumberOfOpenTabs() {
-    const pages = await this.browser.getWindowHandles()
-    this.debugSection('Tabs', `Total ${pages.length}`)
-    return pages.length
+    const pages = await this.browser.getWindowHandles();
+    this.debugSection('Tabs', `Total ${pages.length}`);
+    return pages.length;
   }
 
   /**
    * {{> refreshPage }}
    */
   async refreshPage() {
-    const client = this.browser
-    return client.refresh()
+    const client = this.browser;
+    return client.refresh();
   }
 
   /**
    * {{> scrollPageToTop }}
    */
   scrollPageToTop() {
-    const client = this.browser
+    const client = this.browser;
     /* eslint-disable prefer-arrow-callback */
     return client.execute(function () {
-      window.scrollTo(0, 0)
-    })
+      window.scrollTo(0, 0);
+    });
     /* eslint-enable */
   }
 
@@ -2706,16 +2573,19 @@ class WebDriver extends Helper {
    * {{> scrollPageToBottom }}
    */
   scrollPageToBottom() {
-    const client = this.browser
+    const client = this.browser;
     /* eslint-disable prefer-arrow-callback, comma-dangle */
     return client.execute(function () {
-      const body = document.body
-      const html = document.documentElement
-      window.scrollTo(
-        0,
-        Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight),
-      )
-    })
+      const body = document.body;
+      const html = document.documentElement;
+      window.scrollTo(0, Math.max(
+        body.scrollHeight,
+        body.offsetHeight,
+        html.clientHeight,
+        html.scrollHeight,
+        html.offsetHeight
+      ));
+    });
     /* eslint-enable */
   }
 
@@ -2727,11 +2597,11 @@ class WebDriver extends Helper {
     function getScrollPosition() {
       return {
         x: window.pageXOffset,
-        y: window.pageYOffset,
-      }
+        y: window.pageYOffset
+      };
     }
     /* eslint-enable comma-dangle */
-    return this.executeScript(getScrollPosition)
+    return this.executeScript(getScrollPosition);
   }
 
   /**
@@ -2744,15 +2614,15 @@ class WebDriver extends Helper {
     if (!this.options.automationProtocol) {
       console.log(`setGeoLocation deprecated:
     * This command is deprecated due to using deprecated JSON Wire Protocol command. More info: https://webdriver.io/docs/api/jsonwp/#setgeolocation
-    * Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration`)
-      return
+    * Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration`);
+      return;
     }
-    this.geoLocation = { latitude, longitude }
+    this.geoLocation = { latitude, longitude };
 
     await this.browser.call(async () => {
-      const pages = await this.puppeteerBrowser.pages()
-      await pages[0].setGeolocation({ latitude, longitude })
-    })
+      const pages = await this.puppeteerBrowser.pages();
+      await pages[0].setGeolocation({ latitude, longitude });
+    });
   }
 
   /**
@@ -2765,27 +2635,27 @@ class WebDriver extends Helper {
     if (!this.options.automationProtocol) {
       console.log(`grabGeoLocation deprecated:
     * This command is deprecated due to using deprecated JSON Wire Protocol command. More info: https://webdriver.io/docs/api/jsonwp/#getgeolocation
-    * Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration`)
-      return
+    * Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration`);
+      return;
     }
-    if (!this.geoLocation) return 'No GeoLocation is set!'
-    return this.geoLocation
+    if (!this.geoLocation) return 'No GeoLocation is set!';
+    return this.geoLocation;
   }
 
   /**
    * {{> grabElementBoundingRect }}
    */
   async grabElementBoundingRect(locator, prop) {
-    const res = await this._locate(locator, true)
-    assertElementExists(res, locator)
-    const el = usingFirstElement(res)
+    const res = await this._locate(locator, true);
+    assertElementExists(res, locator);
+    const el = usingFirstElement(res);
 
     const rect = {
       ...(await el.getLocation()),
       ...(await el.getSize()),
-    }
-    if (prop) return rect[prop]
-    return rect
+    };
+    if (prop) return rect[prop];
+    return rect;
   }
 
   /**
@@ -2794,21 +2664,23 @@ class WebDriver extends Helper {
    * @param {*} fn
    */
   /* eslint-disable */
-  runOnIOS(caps, fn) {}
+  runOnIOS(caps, fn) {
+  }
 
   /**
    * Placeholder for ~ locator only test case write once run on both Appium and WebDriver.
    * @param {*} caps
    * @param {*} fn
    */
-  runOnAndroid(caps, fn) {}
+  runOnAndroid(caps, fn) {
+  }
   /* eslint-enable */
 
   /**
    * Placeholder for ~ locator only test case write once run on both Appium and WebDriver.
    */
   runInWeb(fn) {
-    return fn()
+    return fn();
   }
 
   /**
@@ -2819,12 +2691,10 @@ class WebDriver extends Helper {
    */
   flushNetworkTraffics() {
     if (!this.options.automationProtocol) {
-      console.log(
-        '* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration',
-      )
-      return
+      console.log('* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration');
+      return;
     }
-    this.requests = []
+    this.requests = [];
   }
 
   /**
@@ -2835,13 +2705,11 @@ class WebDriver extends Helper {
    */
   stopRecordingTraffic() {
     if (!this.options.automationProtocol) {
-      console.log(
-        '* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration',
-      )
-      return
+      console.log('* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration');
+      return;
     }
-    this.page.removeAllListeners('request')
-    this.recording = false
+    this.page.removeAllListeners('request');
+    this.recording = false;
   }
 
   /**
@@ -2853,16 +2721,15 @@ class WebDriver extends Helper {
    */
   async startRecordingTraffic() {
     if (!this.options.automationProtocol) {
-      console.log(
-        '* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration',
-      )
-      return
+      console.log('* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration');
+      return;
     }
-    this.flushNetworkTraffics()
-    this.recording = true
-    this.recordedAtLeastOnce = true
+    this.flushNetworkTraffics();
+    this.recording = true;
+    this.recordedAtLeastOnce = true;
 
-    await this.page.setRequestInterception(true)
+    this.page = (await this.puppeteerBrowser.pages())[0];
+    await this.page.setRequestInterception(true);
 
     this.page.on('request', (request) => {
       const information = {
@@ -2871,16 +2738,16 @@ class WebDriver extends Helper {
         requestHeaders: request.headers(),
         requestPostData: request.postData(),
         response: request.response(),
-      }
+      };
 
-      this.debugSection('REQUEST: ', JSON.stringify(information))
+      this.debugSection('REQUEST: ', JSON.stringify(information));
 
       if (typeof information.requestPostData === 'object') {
-        information.requestPostData = JSON.parse(information.requestPostData)
+        information.requestPostData = JSON.parse(information.requestPostData);
       }
-      request.continue()
-      this.requests.push(information)
-    })
+      request.continue();
+      this.requests.push(information);
+    });
   }
 
   /**
@@ -2891,12 +2758,10 @@ class WebDriver extends Helper {
    */
   async grabRecordedNetworkTraffics() {
     if (!this.options.automationProtocol) {
-      console.log(
-        '* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration',
-      )
-      return
+      console.log('* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration');
+      return;
     }
-    return grabRecordedNetworkTraffics.call(this)
+    return grabRecordedNetworkTraffics.call(this);
   }
 
   /**
@@ -2905,14 +2770,14 @@ class WebDriver extends Helper {
    *
    * {{> seeTraffic }}
    */
-  async seeTraffic({ name, url, parameters, requestPostData, timeout = 10 }) {
+  async seeTraffic({
+    name, url, parameters, requestPostData, timeout = 10,
+  }) {
     if (!this.options.automationProtocol) {
-      console.log(
-        '* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration',
-      )
-      return
+      console.log('* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration');
+      return;
     }
-    await seeTraffic.call(this, ...arguments)
+    await seeTraffic.call(this, ...arguments);
   }
 
   /**
@@ -2924,40 +2789,38 @@ class WebDriver extends Helper {
    */
   dontSeeTraffic({ name, url }) {
     if (!this.options.automationProtocol) {
-      console.log(
-        '* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration',
-      )
-      return
+      console.log('* Switch to devtools protocol to use this command by setting devtoolsProtocol: true in the configuration');
+      return;
     }
-    dontSeeTraffic.call(this, ...arguments)
+    dontSeeTraffic.call(this, ...arguments);
   }
 }
 
 async function proceedSee(assertType, text, context, strict = false) {
-  let description
+  let description;
   if (!context) {
     if (this.context === webRoot) {
-      context = this.context
-      description = 'web page'
+      context = this.context;
+      description = 'web page';
     } else {
-      description = `current context ${this.context}`
-      context = './/*'
+      description = `current context ${this.context}`;
+      context = './/*';
     }
   } else {
-    description = `element ${context}`
+    description = `element ${context}`;
   }
 
-  const smartWaitEnabled = assertType === 'assert'
-  const res = await this._locate(withStrictLocator(context), smartWaitEnabled)
-  assertElementExists(res, context)
-  const selected = await forEachAsync(res, async (el) => this.browser.getElementText(getElementId(el)))
+  const smartWaitEnabled = assertType === 'assert';
+  const res = await this._locate(withStrictLocator(context), smartWaitEnabled);
+  assertElementExists(res, context);
+  const selected = await forEachAsync(res, async el => this.browser.getElementText(getElementId(el)));
   if (strict) {
     if (Array.isArray(selected) && selected.length !== 0) {
-      return selected.map((elText) => equals(description)[assertType](text, elText))
+      return selected.map(elText => equals(description)[assertType](text, elText));
     }
-    return equals(description)[assertType](text, selected)
+    return equals(description)[assertType](text, selected);
   }
-  return stringIncludes(description)[assertType](text, selected)
+  return stringIncludes(description)[assertType](text, selected);
 }
 
 /**
@@ -2974,19 +2837,21 @@ async function proceedSee(assertType, text, context, strict = false) {
  * @return {Promise<Array>} - Array of values.
  */
 async function forEachAsync(array, callback, options = { expandArrayResults: true }) {
-  const { expandArrayResults = true } = options
-  const inputArray = Array.isArray(array) ? array : [array]
-  const values = []
+  const {
+    expandArrayResults = true,
+  } = options;
+  const inputArray = Array.isArray(array) ? array : [array];
+  const values = [];
   for (let index = 0; index < inputArray.length; index++) {
-    const res = await callback(inputArray[index], index, inputArray)
+    const res = await callback(inputArray[index], index, inputArray);
 
     if (Array.isArray(res) && expandArrayResults) {
-      res.forEach((val) => values.push(val))
+      res.forEach(val => values.push(val));
     } else if (res) {
-      values.push(res)
+      values.push(res);
     }
   }
-  return values
+  return values;
 }
 
 /**
@@ -3001,380 +2866,374 @@ async function forEachAsync(array, callback, options = { expandArrayResults: tru
  * @return {Promise<Array>} - Array of values.
  */
 async function filterAsync(array, callback) {
-  const inputArray = Array.isArray(array) ? array : [array]
-  const values = []
+  const inputArray = Array.isArray(array) ? array : [array];
+  const values = [];
   for (let index = 0; index < inputArray.length; index++) {
-    const res = await callback(inputArray[index], index, inputArray)
-    const value = Array.isArray(res) ? res[0] : res
+    const res = await callback(inputArray[index], index, inputArray);
+    const value = Array.isArray(res) ? res[0] : res;
 
     if (value) {
-      values.push(inputArray[index])
+      values.push(inputArray[index]);
     }
   }
-  return values
+  return values;
 }
 
 async function findClickable(locator, locateFn) {
-  locator = new Locator(locator)
+  locator = new Locator(locator);
 
   if (this._isCustomLocator(locator)) {
-    return locateFn(locator.value)
+    return locateFn(locator.value);
   }
 
-  if (locator.isAccessibilityId() && !this.isWeb) return locateFn(locator, true)
-  if (!locator.isFuzzy()) return locateFn(locator, true)
+  if (locator.isAccessibilityId() && !this.isWeb) return locateFn(locator, true);
+  if (!locator.isFuzzy()) return locateFn(locator, true);
 
-  let els
-  const literal = xpathLocator.literal(locator.value)
+  let els;
+  const literal = xpathLocator.literal(locator.value);
 
-  els = await locateFn(Locator.clickable.narrow(literal))
-  if (els.length) return els
+  els = await locateFn(Locator.clickable.narrow(literal));
+  if (els.length) return els;
 
-  els = await locateFn(Locator.clickable.wide(literal))
-  if (els.length) return els
+  els = await locateFn(Locator.clickable.wide(literal));
+  if (els.length) return els;
 
-  els = await locateFn(Locator.clickable.self(literal))
-  if (els.length) return els
+  els = await locateFn(Locator.clickable.self(literal));
+  if (els.length) return els;
 
-  return locateFn(locator.value) // by css or xpath
+  return locateFn(locator.value); // by css or xpath
 }
 
 async function findFields(locator) {
-  locator = new Locator(locator)
+  locator = new Locator(locator);
 
   if (this._isCustomLocator(locator)) {
-    return this._locate(locator)
+    return this._locate(locator);
   }
 
-  if (locator.isAccessibilityId() && !this.isWeb) return this._locate(locator, true)
-  if (!locator.isFuzzy()) return this._locate(locator, true)
+  if (locator.isAccessibilityId() && !this.isWeb) return this._locate(locator, true);
+  if (!locator.isFuzzy()) return this._locate(locator, true);
 
-  const literal = xpathLocator.literal(locator.value)
-  let els = await this._locate(Locator.field.labelEquals(literal))
-  if (els.length) return els
+  const literal = xpathLocator.literal(locator.value);
+  let els = await this._locate(Locator.field.labelEquals(literal));
+  if (els.length) return els;
 
-  els = await this._locate(Locator.field.labelContains(literal))
-  if (els.length) return els
+  els = await this._locate(Locator.field.labelContains(literal));
+  if (els.length) return els;
 
-  els = await this._locate(Locator.field.byName(literal))
-  if (els.length) return els
-  return this._locate(locator.value) // by css or xpath
+  els = await this._locate(Locator.field.byName(literal));
+  if (els.length) return els;
+  return this._locate(locator.value); // by css or xpath
 }
 
 async function proceedSeeField(assertType, field, value) {
-  const res = await findFields.call(this, field)
-  assertElementExists(res, field, 'Field')
-  const elem = usingFirstElement(res)
-  const elemId = getElementId(elem)
+  const res = await findFields.call(this, field);
+  assertElementExists(res, field, 'Field');
+  const elem = usingFirstElement(res);
+  const elemId = getElementId(elem);
 
   const proceedMultiple = async (fields) => {
-    const fieldResults = toArray(
-      await forEachAsync(fields, async (el) => {
-        const elementId = getElementId(el)
-        return this.browser.isW3C ? el.getValue() : this.browser.getElementAttribute(elementId, 'value')
-      }),
-    )
+    const fieldResults = toArray(await forEachAsync(fields, async (el) => {
+      const elementId = getElementId(el);
+      return this.browser.isW3C ? el.getValue() : this.browser.getElementAttribute(elementId, 'value');
+    }));
 
     if (typeof value === 'boolean') {
-      equals(`no. of items matching > 0: ${field}`)[assertType](value, !!fieldResults.length)
+      equals(`no. of items matching > 0: ${field}`)[assertType](value, !!fieldResults.length);
     } else {
       // Assert that results were found so the forEach assert does not silently pass
-      equals(`no. of items matching > 0:  ${field}`)[assertType](true, !!fieldResults.length)
-      fieldResults.forEach((val) => stringIncludes(`fields by ${field}`)[assertType](value, val))
+      equals(`no. of items matching > 0:  ${field}`)[assertType](true, !!fieldResults.length);
+      fieldResults.forEach(val => stringIncludes(`fields by ${field}`)[assertType](value, val));
     }
-  }
+  };
 
-  const proceedSingle = (el) =>
-    el.getValue().then((res) => {
-      if (res === null) {
-        throw new Error(`Element ${el.selector} has no value attribute`)
-      }
-      stringIncludes(`fields by ${field}`)[assertType](value, res)
-    })
+  const proceedSingle = el => el.getValue().then((res) => {
+    if (res === null) {
+      throw new Error(`Element ${el.selector} has no value attribute`);
+    }
+    stringIncludes(`fields by ${field}`)[assertType](value, res);
+  });
 
-  const filterBySelected = async (elements) =>
-    filterAsync(elements, async (el) => this.browser.isElementSelected(getElementId(el)))
+  const filterBySelected = async elements => filterAsync(elements, async el => this.browser.isElementSelected(getElementId(el)));
 
   const filterSelectedByValue = async (elements, value) => {
     return filterAsync(elements, async (el) => {
-      const elementId = getElementId(el)
-      const currentValue = this.browser.isW3C
-        ? await el.getValue()
-        : await this.browser.getElementAttribute(elementId, 'value')
-      const isSelected = await this.browser.isElementSelected(elementId)
-      return currentValue === value && isSelected
-    })
-  }
-
-  const tag = await elem.getTagName()
+      const elementId = getElementId(el);
+      const currentValue = this.browser.isW3C ? await el.getValue() : await this.browser.getElementAttribute(elementId, 'value');
+      const isSelected = await this.browser.isElementSelected(elementId);
+      return currentValue === value && isSelected;
+    });
+  };
+
+  const tag = await elem.getTagName();
   if (tag === 'select') {
-    const subOptions = await this.browser.findElementsFromElement(elemId, 'css', 'option')
+    const subOptions = await this.browser.findElementsFromElement(elemId, 'css', 'option');
 
     if (value === '') {
       // Don't filter by value
-      const selectedOptions = await filterBySelected(subOptions)
-      return proceedMultiple(selectedOptions)
+      const selectedOptions = await filterBySelected(subOptions);
+      return proceedMultiple(selectedOptions);
     }
 
-    const options = await filterSelectedByValue(subOptions, value)
-    return proceedMultiple(options)
+    const options = await filterSelectedByValue(subOptions, value);
+    return proceedMultiple(options);
   }
 
   if (tag === 'input') {
-    const fieldType = await elem.getAttribute('type')
+    const fieldType = await elem.getAttribute('type');
 
     if (fieldType === 'checkbox' || fieldType === 'radio') {
       if (typeof value === 'boolean') {
         // Support boolean values
-        const options = await filterBySelected(res)
-        return proceedMultiple(options)
+        const options = await filterBySelected(res);
+        return proceedMultiple(options);
       }
 
-      const options = await filterSelectedByValue(res, value)
-      return proceedMultiple(options)
+      const options = await filterSelectedByValue(res, value);
+      return proceedMultiple(options);
     }
-    return proceedSingle(elem)
+    return proceedSingle(elem);
   }
-  return proceedSingle(elem)
+  return proceedSingle(elem);
 }
 
 function toArray(item) {
   if (!Array.isArray(item)) {
-    return [item]
+    return [item];
   }
-  return item
+  return item;
 }
 
 async function proceedSeeCheckbox(assertType, field) {
-  const res = await findFields.call(this, field)
-  assertElementExists(res, field, 'Field')
+  const res = await findFields.call(this, field);
+  assertElementExists(res, field, 'Field');
 
-  const selected = await forEachAsync(res, async (el) => this.browser.isElementSelected(getElementId(el)))
-  return truth(`checkable field "${field}"`, 'to be checked')[assertType](selected)
+  const selected = await forEachAsync(res, async el => this.browser.isElementSelected(getElementId(el)));
+  return truth(`checkable field "${field}"`, 'to be checked')[assertType](selected);
 }
 
 async function findCheckable(locator, locateFn) {
-  let els
-  locator = new Locator(locator)
+  let els;
+  locator = new Locator(locator);
 
   if (this._isCustomLocator(locator)) {
-    return locateFn(locator.value)
+    return locateFn(locator.value);
   }
 
-  if (locator.isAccessibilityId() && !this.isWeb) return locateFn(locator, true)
-  if (!locator.isFuzzy()) return locateFn(locator, true)
+  if (locator.isAccessibilityId() && !this.isWeb) return locateFn(locator, true);
+  if (!locator.isFuzzy()) return locateFn(locator, true);
 
-  const literal = xpathLocator.literal(locator.value)
-  els = await locateFn(Locator.checkable.byText(literal))
-  if (els.length) return els
-  els = await locateFn(Locator.checkable.byName(literal))
-  if (els.length) return els
+  const literal = xpathLocator.literal(locator.value);
+  els = await locateFn(Locator.checkable.byText(literal));
+  if (els.length) return els;
+  els = await locateFn(Locator.checkable.byName(literal));
+  if (els.length) return els;
 
-  return locateFn(locator.value) // by css or xpath
+  return locateFn(locator.value); // by css or xpath
 }
 
 function withStrictLocator(locator) {
-  locator = new Locator(locator)
-  return locator.simplify()
+  locator = new Locator(locator);
+  return locator.simplify();
 }
 
 function isFrameLocator(locator) {
-  locator = new Locator(locator)
-  if (locator.isFrame()) return locator.value
-  return false
+  locator = new Locator(locator);
+  if (locator.isFrame()) return locator.value;
+  return false;
 }
 
 function assertElementExists(res, locator, prefix, suffix) {
   if (!res || res.length === 0) {
-    throw new ElementNotFound(locator, prefix, suffix)
+    throw new ElementNotFound(locator, prefix, suffix);
   }
 }
 
 function usingFirstElement(els) {
-  if (els.length > 1) debug(`[Elements] Using first element out of ${els.length}`)
-  return els[0]
+  if (els.length > 1) debug(`[Elements] Using first element out of ${els.length}`);
+  return els[0];
 }
 
 function getElementId(el) {
   // W3C WebDriver web element identifier
   // https://w3c.github.io/webdriver/#dfn-web-element-identifier
   if (el['element-6066-11e4-a52e-4f735466cecf']) {
-    return el['element-6066-11e4-a52e-4f735466cecf']
+    return el['element-6066-11e4-a52e-4f735466cecf'];
   }
   // (deprecated) JsonWireProtocol identifier
   // https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#webelement-json-object
   if (el.ELEMENT) {
-    return el.ELEMENT
+    return el.ELEMENT;
   }
 
-  return null
+  return null;
 }
 
 // List of known key values to unicode code points
 // https://www.w3.org/TR/webdriver/#keyboard-actions
 const keyUnicodeMap = {
   /* eslint-disable quote-props */
-  Unidentified: '\uE000',
-  Cancel: '\uE001',
-  Clear: '\uE005',
-  Help: '\uE002',
-  Pause: '\uE00B',
-  Backspace: '\uE003',
-  Return: '\uE006',
-  Enter: '\uE007',
-  Escape: '\uE00C',
-  Alt: '\uE00A',
-  AltLeft: '\uE00A',
-  AltRight: '\uE052',
-  Control: '\uE009',
-  ControlLeft: '\uE009',
-  ControlRight: '\uE051',
-  Meta: '\uE03D',
-  MetaLeft: '\uE03D',
-  MetaRight: '\uE053',
-  Shift: '\uE008',
-  ShiftLeft: '\uE008',
-  ShiftRight: '\uE050',
-  Space: '\uE00D',
+  'Unidentified': '\uE000',
+  'Cancel': '\uE001',
+  'Clear': '\uE005',
+  'Help': '\uE002',
+  'Pause': '\uE00B',
+  'Backspace': '\uE003',
+  'Return': '\uE006',
+  'Enter': '\uE007',
+  'Escape': '\uE00C',
+  'Alt': '\uE00A',
+  'AltLeft': '\uE00A',
+  'AltRight': '\uE052',
+  'Control': '\uE009',
+  'ControlLeft': '\uE009',
+  'ControlRight': '\uE051',
+  'Meta': '\uE03D',
+  'MetaLeft': '\uE03D',
+  'MetaRight': '\uE053',
+  'Shift': '\uE008',
+  'ShiftLeft': '\uE008',
+  'ShiftRight': '\uE050',
+  'Space': '\uE00D',
   ' ': '\uE00D',
-  Tab: '\uE004',
-  Insert: '\uE016',
-  Delete: '\uE017',
-  End: '\uE010',
-  Home: '\uE011',
-  PageUp: '\uE00E',
-  PageDown: '\uE00F',
-  ArrowDown: '\uE015',
-  ArrowLeft: '\uE012',
-  ArrowRight: '\uE014',
-  ArrowUp: '\uE013',
-  F1: '\uE031',
-  F2: '\uE032',
-  F3: '\uE033',
-  F4: '\uE034',
-  F5: '\uE035',
-  F6: '\uE036',
-  F7: '\uE037',
-  F8: '\uE038',
-  F9: '\uE039',
-  F10: '\uE03A',
-  F11: '\uE03B',
-  F12: '\uE03C',
-  Numpad0: '\uE01A',
-  Numpad1: '\uE01B',
-  Numpad2: '\uE01C',
-  Numpad3: '\uE01D',
-  Numpad4: '\uE01E',
-  Numpad5: '\uE01F',
-  Numpad6: '\uE020',
-  Numpad7: '\uE021',
-  Numpad8: '\uE022',
-  Numpad9: '\uE023',
-  NumpadMultiply: '\uE024',
-  NumpadAdd: '\uE025',
-  NumpadSubtract: '\uE027',
-  NumpadDecimal: '\uE028',
-  NumpadDivide: '\uE029',
-  NumpadEnter: '\uE007',
-  NumpadInsert: '\uE05C', // 'Numpad0' alternate (when NumLock off)
-  NumpadDelete: '\uE05D', // 'NumpadDecimal' alternate (when NumLock off)
-  NumpadEnd: '\uE056', // 'Numpad1' alternate (when NumLock off)
-  NumpadHome: '\uE057', // 'Numpad7' alternate (when NumLock off)
-  NumpadPageDown: '\uE055', // 'Numpad3' alternate (when NumLock off)
-  NumpadPageUp: '\uE054', // 'Numpad9' alternate (when NumLock off)
-  NumpadArrowDown: '\uE05B', // 'Numpad2' alternate (when NumLock off)
-  NumpadArrowLeft: '\uE058', // 'Numpad4' alternate (when NumLock off)
-  NumpadArrowRight: '\uE05A', // 'Numpad6' alternate (when NumLock off)
-  NumpadArrowUp: '\uE059', // 'Numpad8' alternate (when NumLock off)
-  Comma: '\uE026', // ',' alias
-  Digit0: '0', // '0' alias
-  Digit1: '1', // '1' alias
-  Digit2: '2', // '2' alias
-  Digit3: '3', // '3' alias
-  Digit4: '4', // '4' alias
-  Digit5: '5', // '5' alias
-  Digit6: '6', // '6' alias
-  Digit7: '7', // '7' alias
-  Digit8: '8', // '8' alias
-  Digit9: '9', // '9' alias
-  Equal: '\uE019', // '=' alias
-  KeyA: 'a', // 'a' alias
-  KeyB: 'b', // 'b' alias
-  KeyC: 'c', // 'c' alias
-  KeyD: 'd', // 'd' alias
-  KeyE: 'e', // 'e' alias
-  KeyF: 'f', // 'f' alias
-  KeyG: 'g', // 'g' alias
-  KeyH: 'h', // 'h' alias
-  KeyI: 'i', // 'i' alias
-  KeyJ: 'j', // 'j' alias
-  KeyK: 'k', // 'k' alias
-  KeyL: 'l', // 'l' alias
-  KeyM: 'm', // 'm' alias
-  KeyN: 'n', // 'n' alias
-  KeyO: 'o', // 'o' alias
-  KeyP: 'p', // 'p' alias
-  KeyQ: 'q', // 'q' alias
-  KeyR: 'r', // 'r' alias
-  KeyS: 's', // 's' alias
-  KeyT: 't', // 't' alias
-  KeyU: 'u', // 'u' alias
-  KeyV: 'v', // 'v' alias
-  KeyW: 'w', // 'w' alias
-  KeyX: 'x', // 'x' alias
-  KeyY: 'y', // 'y' alias
-  KeyZ: 'z', // 'z' alias
-  Period: '.', // '.' alias
-  Semicolon: '\uE018', // ';' alias
-  Slash: '/', // '/' alias
-  ZenkakuHankaku: '\uE040',
+  'Tab': '\uE004',
+  'Insert': '\uE016',
+  'Delete': '\uE017',
+  'End': '\uE010',
+  'Home': '\uE011',
+  'PageUp': '\uE00E',
+  'PageDown': '\uE00F',
+  'ArrowDown': '\uE015',
+  'ArrowLeft': '\uE012',
+  'ArrowRight': '\uE014',
+  'ArrowUp': '\uE013',
+  'F1': '\uE031',
+  'F2': '\uE032',
+  'F3': '\uE033',
+  'F4': '\uE034',
+  'F5': '\uE035',
+  'F6': '\uE036',
+  'F7': '\uE037',
+  'F8': '\uE038',
+  'F9': '\uE039',
+  'F10': '\uE03A',
+  'F11': '\uE03B',
+  'F12': '\uE03C',
+  'Numpad0': '\uE01A',
+  'Numpad1': '\uE01B',
+  'Numpad2': '\uE01C',
+  'Numpad3': '\uE01D',
+  'Numpad4': '\uE01E',
+  'Numpad5': '\uE01F',
+  'Numpad6': '\uE020',
+  'Numpad7': '\uE021',
+  'Numpad8': '\uE022',
+  'Numpad9': '\uE023',
+  'NumpadMultiply': '\uE024',
+  'NumpadAdd': '\uE025',
+  'NumpadSubtract': '\uE027',
+  'NumpadDecimal': '\uE028',
+  'NumpadDivide': '\uE029',
+  'NumpadEnter': '\uE007',
+  'NumpadInsert': '\uE05C', // 'Numpad0' alternate (when NumLock off)
+  'NumpadDelete': '\uE05D', // 'NumpadDecimal' alternate (when NumLock off)
+  'NumpadEnd': '\uE056', // 'Numpad1' alternate (when NumLock off)
+  'NumpadHome': '\uE057', // 'Numpad7' alternate (when NumLock off)
+  'NumpadPageDown': '\uE055', // 'Numpad3' alternate (when NumLock off)
+  'NumpadPageUp': '\uE054', // 'Numpad9' alternate (when NumLock off)
+  'NumpadArrowDown': '\uE05B', // 'Numpad2' alternate (when NumLock off)
+  'NumpadArrowLeft': '\uE058', // 'Numpad4' alternate (when NumLock off)
+  'NumpadArrowRight': '\uE05A', // 'Numpad6' alternate (when NumLock off)
+  'NumpadArrowUp': '\uE059', // 'Numpad8' alternate (when NumLock off)
+  'Comma': '\uE026', // ',' alias
+  'Digit0': '0', // '0' alias
+  'Digit1': '1', // '1' alias
+  'Digit2': '2', // '2' alias
+  'Digit3': '3', // '3' alias
+  'Digit4': '4', // '4' alias
+  'Digit5': '5', // '5' alias
+  'Digit6': '6', // '6' alias
+  'Digit7': '7', // '7' alias
+  'Digit8': '8', // '8' alias
+  'Digit9': '9', // '9' alias
+  'Equal': '\uE019', // '=' alias
+  'KeyA': 'a', // 'a' alias
+  'KeyB': 'b', // 'b' alias
+  'KeyC': 'c', // 'c' alias
+  'KeyD': 'd', // 'd' alias
+  'KeyE': 'e', // 'e' alias
+  'KeyF': 'f', // 'f' alias
+  'KeyG': 'g', // 'g' alias
+  'KeyH': 'h', // 'h' alias
+  'KeyI': 'i', // 'i' alias
+  'KeyJ': 'j', // 'j' alias
+  'KeyK': 'k', // 'k' alias
+  'KeyL': 'l', // 'l' alias
+  'KeyM': 'm', // 'm' alias
+  'KeyN': 'n', // 'n' alias
+  'KeyO': 'o', // 'o' alias
+  'KeyP': 'p', // 'p' alias
+  'KeyQ': 'q', // 'q' alias
+  'KeyR': 'r', // 'r' alias
+  'KeyS': 's', // 's' alias
+  'KeyT': 't', // 't' alias
+  'KeyU': 'u', // 'u' alias
+  'KeyV': 'v', // 'v' alias
+  'KeyW': 'w', // 'w' alias
+  'KeyX': 'x', // 'x' alias
+  'KeyY': 'y', // 'y' alias
+  'KeyZ': 'z', // 'z' alias
+  'Period': '.', // '.' alias
+  'Semicolon': '\uE018', // ';' alias
+  'Slash': '/', // '/' alias
+  'ZenkakuHankaku': '\uE040',
   /* eslint-enable quote-props */
-}
+};
 
 function convertKeyToRawKey(key) {
   if (Object.prototype.hasOwnProperty.call(keyUnicodeMap, key)) {
-    return keyUnicodeMap[key]
+    return keyUnicodeMap[key];
   }
   // Key is raw key when no representative unicode code point for value
-  return key
+  return key;
 }
 
 function getNormalizedKey(key) {
-  let normalizedKey = getNormalizedKeyAttributeValue(key)
+  let normalizedKey = getNormalizedKeyAttributeValue(key);
   // Always use "left" modifier keys for non-W3C sessions,
   // as JsonWireProtocol does not support "right" modifier keys
   if (!this.browser.isW3C) {
-    normalizedKey = normalizedKey.replace(/^(Alt|Control|Meta|Shift)Right$/, '$1')
+    normalizedKey = normalizedKey.replace(/^(Alt|Control|Meta|Shift)Right$/, '$1');
   }
   if (key !== normalizedKey) {
-    this.debugSection('Input', `Mapping key '${key}' to '${normalizedKey}'`)
+    this.debugSection('Input', `Mapping key '${key}' to '${normalizedKey}'`);
   }
-  return convertKeyToRawKey(normalizedKey)
+  return convertKeyToRawKey(normalizedKey);
 }
 
-const unicodeModifierKeys = modifierKeys.map((k) => convertKeyToRawKey(k))
+const unicodeModifierKeys = modifierKeys.map(k => convertKeyToRawKey(k));
 function isModifierKey(key) {
-  return unicodeModifierKeys.includes(key)
+  return unicodeModifierKeys.includes(key);
 }
 
 function highlightActiveElement(element) {
   if (this.options.highlightElement && global.debugMode) {
-    highlightElement(element, this.browser)
+    highlightElement(element, this.browser);
   }
 }
 
 function prepareLocateFn(context) {
-  if (!context) return this._locate.bind(this)
+  if (!context) return this._locate.bind(this);
   return (l) => {
-    l = new Locator(l, 'css')
+    l = new Locator(l, 'css');
     return this._locate(context, true).then(async (res) => {
-      assertElementExists(res, context, 'Context element')
+      assertElementExists(res, context, 'Context element');
       if (l.react) {
-        return res[0].react$$(l.react, l.props || undefined)
+        return res[0].react$$(l.react, l.props || undefined);
       }
-      return res[0].$$(l.simplify())
-    })
-  }
+      return res[0].$$(l.simplify());
+    });
+  };
 }
 
-module.exports = WebDriver
+export default WebDriver;