codeceptjs 3.6.10 → 3.7.0-beta.2

package/lib/helper/WebDriver.js

@@ -10,16 +10,7 @@ const { urlEquals, equals } = require('../assert/equal')
 const { debug } = require('../output')
 const { empty } = require('../assert/empty')
 const { truth } = require('../assert/truth')
-const {
-  xpathLocator,
-  fileExists,
-  decodeUrl,
-  chunkArray,
-  convertCssPropertiesToCamelCase,
-  screenshotOutputFolder,
-  getNormalizedKeyAttributeValue,
-  modifierKeys,
-} = require('../utils')
+const { xpathLocator, fileExists, decodeUrl, chunkArray, convertCssPropertiesToCamelCase, screenshotOutputFolder, getNormalizedKeyAttributeValue, modifierKeys } = require('../utils')
 const { isColorProperty, convertColorToRGBA } = require('../colorUtils')
 const ElementNotFound = require('./errors/ElementNotFound')
 const ConnectionRefused = require('./errors/ConnectionRefused')
@@ -27,19 +18,8 @@ const Locator = require('../locator')
 const { highlightElement } = require('./scripts/highlightElement')
 const { focusElement } = require('./scripts/focusElement')
 const { blurElement } = require('./scripts/blurElement')
-const {
-  dontSeeElementError,
-  seeElementError,
-  seeElementInDOMError,
-  dontSeeElementInDOMError,
-} = require('./errors/ElementAssertion')
-const {
-  dontSeeTraffic,
-  seeTraffic,
-  grabRecordedNetworkTraffics,
-  stopRecordingTraffic,
-  flushNetworkTraffics,
-} = require('./network/actions')
+const { dontSeeElementError, seeElementError, seeElementInDOMError, dontSeeElementInDOMError } = require('./errors/ElementAssertion')
+const { dontSeeTraffic, seeTraffic, grabRecordedNetworkTraffics, stopRecordingTraffic, flushNetworkTraffics } = require('./network/actions')
 
 const SHADOW = 'shadow'
 const webRoot = 'body'
@@ -595,10 +575,7 @@ class WebDriver extends Helper {
   }
 
   async _res(locator) {
-    const res =
-      this._isShadowLocator(locator) || this._isCustomLocator(locator)
-        ? await this._locate(locator)
-        : await this.$$(withStrictLocator(locator))
+    const res = this._isShadowLocator(locator) || this._isCustomLocator(locator) ? await this._locate(locator) : await this.$$(withStrictLocator(locator))
     return res
   }
 
@@ -631,7 +608,7 @@ class WebDriver extends Helper {
     this.$$ = this.browser.$$.bind(this.browser)
 
     if (this._isCustomLocatorStrategyDefined()) {
-      Object.keys(this.customLocatorStrategies).forEach(async (customLocator) => {
+      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)
@@ -642,6 +619,7 @@ class WebDriver extends Helper {
       this.browser.capabilities.platformName = this.browser.capabilities.platformName.toLowerCase()
     }
 
+    this.browser.on('dialog', () => {})
     return this.browser
   }
 
@@ -667,7 +645,7 @@ class WebDriver extends Helper {
       this.isRunning = false
       return this.browser.deleteSession()
     }
-    if (this.browser.isInsideFrame) await this.browser.switchToFrame(null)
+    if (this.browser.isInsideFrame) await this.browser.switchFrame(null)
 
     if (this.options.keepBrowserState) return
 
@@ -675,7 +653,7 @@ class WebDriver extends Helper {
       this.debugSection('Session', 'cleaning cookies and localStorage')
       await this.browser.deleteCookies()
     }
-    await this.browser.execute('localStorage.clear();').catch((err) => {
+    await this.browser.execute('localStorage.clear();').catch(err => {
       if (!(err.message.indexOf("Storage is disabled inside 'data:' URLs.") > -1)) throw err
     })
     await this.closeOtherTabs()
@@ -705,17 +683,17 @@ class WebDriver extends Helper {
 
         return browser
       },
-      stop: async (browser) => {
+      stop: async browser => {
         if (!browser) return
         return browser.deleteSession()
       },
-      loadVars: async (browser) => {
+      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
       },
-      restoreVars: async (session) => {
+      restoreVars: async session => {
         if (!session) {
           this.activeSessionName = ''
         }
@@ -757,7 +735,7 @@ class WebDriver extends Helper {
       this.browser.isInsideFrame = true
       if (Array.isArray(frame)) {
         // this.switchTo(null);
-        await forEachAsync(frame, async (f) => this.switchTo(f))
+        await forEachAsync(frame, async f => this.switchTo(f))
         return
       }
       await this.switchTo(frame)
@@ -835,10 +813,7 @@ 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}`,
-    )
+    this.debugSection(`SmartWait (${this.options.smartWait}ms)`, `Locating ${JSON.stringify(locator)} in ${this.options.smartWait}`)
     await this.defineTimeout({ implicit: this.options.smartWait })
   }
 
@@ -913,7 +888,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)
   }
 
   /**
@@ -941,7 +916,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)
   }
 
   /**
@@ -1025,7 +1000,7 @@ class WebDriver extends Helper {
     const elem = usingFirstElement(res)
     highlightActiveElement.call(this, elem)
 
-    return this.executeScript((el) => {
+    return this.executeScript(el => {
       if (document.activeElement instanceof HTMLElement) {
         document.activeElement.blur()
       }
@@ -1097,7 +1072,7 @@ class WebDriver extends Helper {
     }
     const elem = usingFirstElement(res)
 
-    return this.executeScript((el) => {
+    return this.executeScript(el => {
       if (document.activeElement instanceof HTMLElement) {
         document.activeElement.blur()
       }
@@ -1160,15 +1135,9 @@ class WebDriver extends Helper {
     }
 
     // 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) => {
+    const clickOptionFn = async el => {
       if (el[0]) el = el[0]
       const elementId = getElementId(el)
       if (elementId) return this.browser.elementClick(elementId)
@@ -1178,19 +1147,9 @@ class WebDriver extends Helper {
       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)
   }
@@ -1217,9 +1176,7 @@ class WebDriver extends Helper {
         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}`)
       }
     }
 
@@ -1272,7 +1229,11 @@ 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)))
+    let val = []
+    await forEachAsync(res, async el => {
+      const text = await this.browser.getElementText(getElementId(el))
+      val.push(text)
+    })
     this.debugSection('GrabText', String(val))
     return val
   }
@@ -1297,7 +1258,7 @@ class WebDriver extends Helper {
    */
   async grabHTMLFromAll(locator) {
     const elems = await this._locate(locator, true)
-    const html = await forEachAsync(elems, (elem) => elem.getHTML(false))
+    const html = await forEachAsync(elems, elem => elem.getHTML(false))
     this.debugSection('GrabHTML', String(html))
     return html
   }
@@ -1322,7 +1283,7 @@ class WebDriver extends Helper {
    */
   async grabValueFromAll(locator) {
     const res = await this._locate(locator, true)
-    const val = await forEachAsync(res, (el) => el.getValue())
+    const val = await forEachAsync(res, el => el.getValue())
     this.debugSection('GrabValue', String(val))
 
     return val
@@ -1347,7 +1308,7 @@ class WebDriver extends Helper {
    */
   async grabCssPropertyFromAll(locator, cssProperty) {
     const res = await this._locate(locator, true)
-    const val = await forEachAsync(res, async (el) => this.browser.getElementCSSValue(getElementId(el), cssProperty))
+    const val = await forEachAsync(res, async el => this.browser.getElementCSSValue(getElementId(el), cssProperty))
     this.debugSection('Grab', String(val))
     return val
   }
@@ -1371,7 +1332,7 @@ class WebDriver extends Helper {
    */
   async grabAttributeFromAll(locator, attr) {
     const res = await this._locate(locator, true)
-    const val = await forEachAsync(res, async (el) => el.getAttribute(attr))
+    const val = await forEachAsync(res, async el => el.getAttribute(attr))
     this.debugSection('GrabAttribute', String(val))
     return val
   }
@@ -1488,7 +1449,7 @@ 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 selected = await forEachAsync(res, async el => el.isDisplayed())
     try {
       return truth(`elements of ${new Locator(locator)}`, 'to be seen').assert(selected)
     } catch (e) {
@@ -1505,7 +1466,7 @@ class WebDriver extends Helper {
     if (!res || res.length === 0) {
       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)
     } catch (e) {
@@ -1590,11 +1551,7 @@ class WebDriver extends Helper {
    */
   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}`,
-    )
+    return assert.equal(res.length, num, `expected number of elements (${new Locator(locator)}) is ${num}, but found ${res.length}`)
   }
 
   /**
@@ -1603,11 +1560,7 @@ class WebDriver extends Helper {
    */
   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}`,
-    )
+    return assert.equal(res, num, `expected number of visible elements (${new Locator(locator)}) is ${num}, but found ${res}`)
   }
 
   /**
@@ -1632,19 +1585,16 @@ class WebDriver extends Helper {
       }
     }
 
-    const values = Object.keys(cssPropertiesCamelCase).map((key) => cssPropertiesCamelCase[key])
+    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) => {
+    chunked = chunked.filter(val => {
       for (let i = 0; i < val.length; ++i) {
-        // eslint-disable-next-line eqeqeq
         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 equals(`all elements (${new Locator(locator)}) to have CSS property ${JSON.stringify(cssProperties)}`).assert(chunked.length, elemAmount)
   }
 
   /**
@@ -1655,28 +1605,24 @@ class WebDriver extends Helper {
     assertElementExists(res, locator)
     const elemAmount = res.length
 
-    let attrs = await forEachAsync(res, async (el) => {
-      return forEachAsync(Object.keys(attributes), async (attr) => el.getAttribute(attr))
+    let attrs = await forEachAsync(res, async el => {
+      return forEachAsync(Object.keys(attributes), async attr => el.getAttribute(attr))
     })
 
-    const values = Object.keys(attributes).map((key) => attributes[key])
+    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) => {
+    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 _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
       }
       return true
     })
-    return assert.ok(
-      chunked.length === elemAmount,
-      `expected all elements (${new Locator(locator)}) to have attributes ${JSON.stringify(attributes)}`,
-    )
+    return assert.ok(chunked.length === elemAmount, `expected all elements (${new Locator(locator)}) to have attributes ${JSON.stringify(attributes)}`)
   }
 
   /**
@@ -1685,9 +1631,9 @@ class WebDriver extends Helper {
   async grabNumberOfVisibleElements(locator) {
     const res = await this._locate(locator)
 
-    let selected = await forEachAsync(res, async (el) => el.isDisplayed())
+    let selected = await forEachAsync(res, async el => el.isDisplayed())
     if (!Array.isArray(selected)) selected = [selected]
-    selected = selected.filter((val) => val === true)
+    selected = selected.filter(val => val === true)
     return selected.length
   }
 
@@ -1860,7 +1806,7 @@ class WebDriver extends Helper {
           width: document.body.scrollWidth,
         }
       })
-      .then((res) => res)
+      .then(res => res)
 
     if (height < 100) height = 500 // errors for very small height
 
@@ -1928,7 +1874,7 @@ class WebDriver extends Helper {
 
     return promiseRetry(
       async (retry, number) => {
-        const _grabCookie = async (name) => {
+        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`)
         }
@@ -1952,11 +1898,10 @@ class WebDriver extends Helper {
    * libraries](http://jster.net/category/windows-modals-popups).
    */
   async acceptPopup() {
-    return this.browser.getAlertText().then((res) => {
-      if (res !== null) {
-        return this.browser.acceptAlert()
-      }
-    })
+    const text = await this.browser.getAlertText()
+    if (text) {
+      return await this.browser.acceptAlert()
+    }
   }
 
   /**
@@ -1964,11 +1909,10 @@ class WebDriver extends Helper {
    *
    */
   async cancelPopup() {
-    return this.browser.getAlertText().then((res) => {
-      if (res !== null) {
-        return this.browser.dismissAlert()
-      }
-    })
+    const text = await this.browser.getAlertText()
+    if (text) {
+      return await this.browser.dismissAlert()
+    }
   }
 
   /**
@@ -1978,7 +1922,7 @@ class WebDriver extends Helper {
    * @param {string} text value to check.
    */
   async seeInPopup(text) {
-    return this.browser.getAlertText().then((res) => {
+    return await this.browser.getAlertText().then(res => {
       if (res === null) {
         throw new Error('Popup is not opened')
       }
@@ -2259,9 +2203,9 @@ class WebDriver extends Helper {
   async closeOtherTabs() {
     const handles = await this.browser.getWindowHandles()
     const currentHandle = await this.browser.getWindowHandle()
-    const otherHandles = handles.filter((handle) => handle !== currentHandle)
+    const otherHandles = handles.filter(handle => handle !== currentHandle)
 
-    await forEachAsync(otherHandles, async (handle) => {
+    await forEachAsync(otherHandles, async handle => {
       await this.browser.switchToWindow(handle)
       await this.browser.closeWindow()
     })
@@ -2272,7 +2216,7 @@ class WebDriver extends Helper {
    * {{> wait }}
    */
   async wait(sec) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       setTimeout(resolve, sec * 1000)
     })
   }
@@ -2289,9 +2233,9 @@ class WebDriver extends Helper {
         if (!res || res.length === 0) {
           return false
         }
-        const selected = await forEachAsync(res, async (el) => this.browser.isElementEnabled(getElementId(el)))
+        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.filter(val => val === true).length > 0
         }
         return selected
       },
@@ -2346,14 +2290,14 @@ class WebDriver extends Helper {
     return client
       .waitUntil(
         function () {
-          return this.getUrl().then((res) => {
+          return this.getUrl().then(res => {
             currUrl = decodeUrl(res)
             return currUrl.indexOf(urlPart) > -1
           })
         },
         { timeout: aSec * 1000 },
       )
-      .catch((e) => {
+      .catch(e => {
         if (e.message.indexOf('timeout')) {
           throw new Error(`expected url to include ${urlPart}, but found ${currUrl}`)
         }
@@ -2373,12 +2317,12 @@ class WebDriver extends Helper {
     let currUrl = ''
     return this.browser
       .waitUntil(function () {
-        return this.getUrl().then((res) => {
+        return this.getUrl().then(res => {
           currUrl = decodeUrl(res)
           return currUrl === urlPart
         })
       }, aSec * 1000)
-      .catch((e) => {
+      .catch(e => {
         if (e.message.indexOf('timeout')) {
           throw new Error(`expected url to be ${urlPart}, but found ${currUrl}`)
         }
@@ -2398,9 +2342,9 @@ class WebDriver extends Helper {
       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)))
+        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.filter(part => part.indexOf(text) >= 0).length > 0
         }
         return selected.indexOf(text) >= 0
       },
@@ -2422,9 +2366,9 @@ class WebDriver extends Helper {
       async () => {
         const res = await findFields.call(this, field)
         if (!res || res.length === 0) return false
-        const selected = await forEachAsync(res, async (el) => el.getValue())
+        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.filter(part => part.indexOf(value) >= 0).length > 0
         }
         return selected.indexOf(value) >= 0
       },
@@ -2446,9 +2390,9 @@ class WebDriver extends Helper {
       async () => {
         const res = await this._res(locator)
         if (!res || res.length === 0) return false
-        const selected = await forEachAsync(res, async (el) => el.isDisplayed())
+        const selected = await forEachAsync(res, async el => el.isDisplayed())
         if (Array.isArray(selected)) {
-          return selected.filter((val) => val === true).length > 0
+          return selected.filter(val => val === true).length > 0
         }
         return selected
       },
@@ -2469,10 +2413,10 @@ class WebDriver extends Helper {
       async () => {
         const res = await this._res(locator)
         if (!res || res.length === 0) return false
-        let selected = await forEachAsync(res, async (el) => el.isDisplayed())
+        let selected = await forEachAsync(res, async el => el.isDisplayed())
 
         if (!Array.isArray(selected)) selected = [selected]
-        selected = selected.filter((val) => val === true)
+        selected = selected.filter(val => val === true)
         return selected.length === num
       },
       {
@@ -2492,7 +2436,7 @@ class WebDriver extends Helper {
       async () => {
         const res = await this._res(locator)
         if (!res || res.length === 0) return true
-        const selected = await forEachAsync(res, async (el) => el.isDisplayed())
+        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` },
@@ -2568,17 +2512,14 @@ class WebDriver extends Helper {
    */
   async switchTo(locator) {
     this.browser.isInsideFrame = true
-    if (Number.isInteger(locator)) {
-      return this.browser.switchToFrame(locator)
-    }
     if (!locator) {
-      return this.browser.switchToFrame(null)
+      return this.browser.switchFrame(null)
     }
 
     let res = await this._locate(locator, true)
     assertElementExists(res, locator)
     res = usingFirstElement(res)
-    return this.browser.switchToFrame(res)
+    return this.browser.switchFrame(res)
   }
 
   /**
@@ -2591,7 +2532,7 @@ class WebDriver extends Helper {
 
     await this.browser.waitUntil(
       async () => {
-        await this.browser.getWindowHandles().then((handles) => {
+        await this.browser.getWindowHandles().then(handles => {
           if (handles.indexOf(current) + num + 1 <= handles.length) {
             target = handles[handles.indexOf(current) + num]
           }
@@ -2613,7 +2554,7 @@ class WebDriver extends Helper {
 
     await this.browser.waitUntil(
       async () => {
-        await this.browser.getWindowHandles().then((handles) => {
+        await this.browser.getWindowHandles().then(handles => {
           if (handles.indexOf(current) - num > -1) {
             target = handles[handles.indexOf(current) - num]
           }
@@ -2683,10 +2624,7 @@ class WebDriver extends Helper {
     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),
-      )
+      window.scrollTo(0, Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight))
     })
   }
 
@@ -2760,10 +2698,10 @@ async function proceedSee(assertType, text, context, strict = false) {
   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 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)
   }
@@ -2791,7 +2729,7 @@ async function forEachAsync(array, callback, options = { expandArrayResults: tru
     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)
     }
@@ -2877,11 +2815,11 @@ async function proceedSeeField(assertType, field, value) {
   const elem = usingFirstElement(res)
   const elemId = getElementId(elem)
 
-  const proceedMultiple = async (fields) => {
+  const proceedMultiple = async fields => {
     const fieldResults = toArray(
-      await forEachAsync(fields, async (el) => {
+      await forEachAsync(fields, async el => {
         const elementId = getElementId(el)
-        return this.browser.isW3C ? el.getValue() : this.browser.getElementAttribute(elementId, 'value')
+        return this.browser.getElementAttribute(elementId, 'value')
       }),
     )
 
@@ -2890,27 +2828,24 @@ async function proceedSeeField(assertType, field, value) {
     } 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))
+      fieldResults.forEach(val => stringIncludes(`fields by ${field}`)[assertType](value, val))
     }
   }
 
-  const proceedSingle = (el) =>
-    el.getValue().then((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) => {
+    return filterAsync(elements, async el => {
       const elementId = getElementId(el)
-      const currentValue = this.browser.isW3C
-        ? await el.getValue()
-        : await this.browser.getElementAttribute(elementId, 'value')
+      const currentValue = await this.browser.getElementAttribute(elementId, 'value')
       const isSelected = await this.browser.isElementSelected(elementId)
       return currentValue === value && isSelected
     })
@@ -2918,7 +2853,13 @@ async function proceedSeeField(assertType, field, value) {
 
   const tag = await elem.getTagName()
   if (tag === 'select') {
-    const subOptions = await this.browser.findElementsFromElement(elemId, 'css', 'option')
+    let subOptions
+
+    try {
+      subOptions = await this.browser.findElementsFromElement(elemId, 'css', 'option')
+    } catch (e) {
+      subOptions = await this.browser.findElementsFromElement(elemId, 'xpath', 'option')
+    }
 
     if (value === '') {
       // Don't filter by value
@@ -2959,7 +2900,7 @@ async function proceedSeeCheckbox(assertType, field) {
   const res = await findFields.call(this, field)
   assertElementExists(res, field, 'Field')
 
-  const selected = await forEachAsync(res, async (el) => this.browser.isElementSelected(getElementId(el)))
+  const selected = await forEachAsync(res, async el => this.browser.isElementSelected(getElementId(el)))
   return truth(`checkable field "${field}"`, 'to be checked')[assertType](selected)
 }
 
@@ -3160,7 +3101,7 @@ function getNormalizedKey(key) {
   return convertKeyToRawKey(normalizedKey)
 }
 
-const unicodeModifierKeys = modifierKeys.map((k) => convertKeyToRawKey(k))
+const unicodeModifierKeys = modifierKeys.map(k => convertKeyToRawKey(k))
 function isModifierKey(key) {
   return unicodeModifierKeys.includes(key)
 }
@@ -3173,9 +3114,9 @@ function highlightActiveElement(element) {
 
 function prepareLocateFn(context) {
   if (!context) return this._locate.bind(this)
-  return (l) => {
+  return l => {
     l = new Locator(l, 'css')
-    return this._locate(context, true).then(async (res) => {
+    return this._locate(context, true).then(async res => {
       assertElementExists(res, context, 'Context element')
       if (l.react) {
         return res[0].react$$(l.react, l.props || undefined)