try to fix some wdio tests

Author: kobenguyent

eslint.config.mjs

@@ -80,6 +80,7 @@ export default [
       'prefer-const': 0,
       'no-extra-semi': 0,
       'max-classes-per-file': 0,
+      'no-return-await': 0,
     },
   },
 ]

lib/helper/WebDriver.js

@@ -1898,23 +1898,21 @@ 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()
+    }
   }
 
   /**
    * Dismisses the active JavaScript popup, as created by `window.alert|window.confirm|window.prompt`.
    *
    */
   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()
+    }
   }
 
   /**
@@ -1924,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')
       }
@@ -2521,7 +2519,7 @@ class WebDriver extends Helper {
     let res = await this._locate(locator, true)
     assertElementExists(res, locator)
     res = usingFirstElement(res)
-    return this.browser.switchFrame(res)
+    return this.browser.switchFrame(res.elementId)
   }
 
   /**
@@ -2821,7 +2819,7 @@ async function proceedSeeField(assertType, field, value) {
     const fieldResults = toArray(
       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')
       }),
     )
 
@@ -2847,15 +2845,21 @@ async function proceedSeeField(assertType, field, value) {
   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 currentValue = 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')
+    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

test/helper/WebDriver_test.js

@@ -198,7 +198,6 @@ describe('WebDriver', function () {
       await wd.seeInField('select2', 'see test three')
     })
 
-
     it('should return error when element has no value attribute', async () => {
       await wd.amOnPage('https://codecept.io/quickstart')
 
@@ -386,16 +385,10 @@ describe('WebDriver', function () {
     it('should grab the innerHTML for an element', async () => {
       await wd.amOnPage('/')
       const source = await wd.grabHTMLFrom('#area1')
-      assert.deepEqual(
-        source,
-        `
-    <a href="/form/file" qa-id="test" qa-link="test"> Test Link </a>
-`,
-      )
+      assert.deepEqual(source, '<a href="/form/file" qa-id="test" qa-link="test">Test Link</a>')
     })
   })
 
-
   describe('#seeTitleEquals', () => {
     it('should check that title is equal to provided one', async () => {
       await wd.amOnPage('/')
@@ -794,7 +787,7 @@ describe('WebDriver', function () {
         await wd.switchTo('h1')
       } catch (e) {
         e.should.be.instanceOf(Error)
-        e.message.should.contain('no such frame')
+        e.message.should.contain('No frame')
       }
     })