codeceptjs 4.0.2-beta.8 → 4.0.2

package/lib/helper/Puppeteer.js

@@ -8,6 +8,7 @@ import promiseRetry from 'promise-retry'
 import Locator from '../locator.js'
 import recorder from '../recorder.js'
 import store from '../store.js'
+import { checkFocusBeforeType, checkFocusBeforePressKey } from './extras/focusCheck.js'
 import { includes as stringIncludes } from '../assert/include.js'
 import { urlEquals, equals } from '../assert/equal.js'
 import { empty } from '../assert/empty.js'
@@ -26,17 +27,25 @@ import {
   isModifierKey,
   requireWithFallback,
   normalizeSpacesInString,
+  normalizePath,
+  resolveUrl,
+  getMimeType,
+  base64EncodeFile,
 } from '../utils.js'
 import { isColorProperty, convertColorToRGBA } from '../colorUtils.js'
 import ElementNotFound from './errors/ElementNotFound.js'
+import MultipleElementsFound from './errors/MultipleElementsFound.js'
 import RemoteBrowserConnectionRefused from './errors/RemoteBrowserConnectionRefused.js'
 import Popup from './extras/Popup.js'
 import Console from './extras/Console.js'
 import { highlightElement } from './scripts/highlightElement.js'
 import { blurElement } from './scripts/blurElement.js'
+import { dropFile } from './scripts/dropFile.js'
 import { dontSeeElementError, seeElementError, dontSeeElementInDOMError, seeElementInDOMError } from './errors/ElementAssertion.js'
 import { dontSeeTraffic, seeTraffic, grabRecordedNetworkTraffics, stopRecordingTraffic, flushNetworkTraffics } from './network/actions.js'
 import WebElement from '../element/WebElement.js'
+import { selectElement } from './extras/elementSelection.js'
+import { fillRichEditor } from './extras/richTextEditor.js'
 
 let puppeteer
 
@@ -266,6 +275,7 @@ class Puppeteer extends Helper {
       show: false,
       defaultPopupAction: 'accept',
       highlightElement: false,
+      strict: false,
     }
 
     return Object.assign(defaults, config)
@@ -743,7 +753,7 @@ class Puppeteer extends Helper {
     }
 
     if (this.options.trace) {
-      const fileName = `${`${global.output_dir}${path.sep}trace${path.sep}${uuidv4()}_${clearString(this.currentRunningTest.title)}`.slice(0, 245)}.json`
+      const fileName = `${`${store.outputDir}${path.sep}trace${path.sep}${uuidv4()}_${clearString(this.currentRunningTest.title)}`.slice(0, 245)}.json`
       const dir = path.dirname(fileName)
       if (!fileExists(dir)) fs.mkdirSync(dir)
       await this.page.tracing.start({ screenshots: true, path: fileName })
@@ -811,12 +821,28 @@ class Puppeteer extends Helper {
 
   /**
    * {{> moveCursorTo }}
-   * {{ react }}
    */
   async moveCursorTo(locator, offsetX = 0, offsetY = 0) {
-    const el = await this._locateElement(locator)
-    if (!el) {
-      throw new ElementNotFound(locator, 'Element to move cursor to')
+    let context = null
+    if (typeof offsetX !== 'number') {
+      context = offsetX
+      offsetX = 0
+    }
+
+    let el
+    if (context) {
+      const contextEls = await findElements.call(this, this.page, context)
+      assertElementExists(contextEls, context, 'Context element')
+      const els = await findElements.call(this, contextEls[0], locator)
+      if (!els || els.length === 0) {
+        throw new ElementNotFound(locator, 'Element to move cursor to')
+      }
+      el = els[0]
+    } else {
+      el = await this._locateElement(locator)
+      if (!el) {
+        throw new ElementNotFound(locator, 'Element to move cursor to')
+      }
     }
 
     // Use manual mouse.move instead of .hover() so the offset can be added to the coordinates
@@ -965,7 +991,6 @@ class Puppeteer extends Helper {
    * const elements = await this.helpers['Puppeteer']._locate({name: 'password'});
    * ```
    *
-   * {{ react }}
    */
   async _locate(locator) {
     const context = await this.context
@@ -980,10 +1005,17 @@ class Puppeteer extends Helper {
    * const element = await this.helpers['Puppeteer']._locateElement({name: 'password'});
    * ```
    *
-   * {{ react }}
    */
   async _locateElement(locator) {
     const context = await this.context
+    const elementIndex = store.currentStep?.opts?.elementIndex
+    if (this.options.strict || elementIndex) {
+      const elements = await findElements.call(this, context, locator)
+      if (elements.length === 0) {
+        throw new ElementNotFound(locator, 'Element', 'was not found')
+      }
+      return selectElement(elements, locator, this)
+    }
     return findElement.call(this, context, locator)
   }
 
@@ -1001,7 +1033,7 @@ class Puppeteer extends Helper {
     if (!els || els.length === 0) {
       throw new ElementNotFound(locator, 'Checkbox or radio')
     }
-    return els[0]
+    return selectElement(els, locator, this)
   }
 
   /**
@@ -1156,10 +1188,17 @@ class Puppeteer extends Helper {
 
   /**
    * {{> seeElement }}
-   * {{ react }}
    */
-  async seeElement(locator) {
-    let els = await this._locate(locator)
+  async seeElement(locator, context = null) {
+    let els
+    if (context) {
+      const contextPage = await this.context
+      const contextEls = await findElements.call(this, contextPage, context)
+      assertElementExists(contextEls, context, 'Context element')
+      els = await findElements.call(this, contextEls[0], locator)
+    } else {
+      els = await this._locate(locator)
+    }
     els = (await Promise.all(els.map(el => el.boundingBox() && el))).filter(v => v)
     // Puppeteer visibility was ignored? | Remove when Puppeteer is fixed
     els = await Promise.all(els.map(async el => (await el.evaluate(node => window.getComputedStyle(node).visibility !== 'hidden' && window.getComputedStyle(node).display !== 'none')) && el))
@@ -1172,10 +1211,17 @@ class Puppeteer extends Helper {
 
   /**
    * {{> dontSeeElement }}
-   * {{ react }}
    */
-  async dontSeeElement(locator) {
-    let els = await this._locate(locator)
+  async dontSeeElement(locator, context = null) {
+    let els
+    if (context) {
+      const contextPage = await this.context
+      const contextEls = await findElements.call(this, contextPage, context)
+      assertElementExists(contextEls, context, 'Context element')
+      els = await findElements.call(this, contextEls[0], locator)
+    } else {
+      els = await this._locate(locator)
+    }
     els = (await Promise.all(els.map(el => el.boundingBox() && el))).filter(v => v)
     // Puppeteer visibility was ignored? | Remove when Puppeteer is fixed
     els = await Promise.all(els.map(async el => (await el.evaluate(node => window.getComputedStyle(node).visibility !== 'hidden' && window.getComputedStyle(node).display !== 'none')) && el))
@@ -1213,7 +1259,6 @@ class Puppeteer extends Helper {
   /**
    * {{> click }}
    *
-   * {{ react }}
    */
   async click(locator = '//body', context = null) {
     return proceedClick.call(this, locator, context)
@@ -1222,7 +1267,6 @@ class Puppeteer extends Helper {
   /**
    * {{> forceClick }}
    *
-   * {{ react }}
    */
   async forceClick(locator, context = null) {
     let matcher = await this.context
@@ -1252,7 +1296,6 @@ class Puppeteer extends Helper {
   /**
    * {{> clickLink }}
    *
-   * {{ react }}
    */
   async clickLink(locator, context = null) {
     return proceedClick.call(this, locator, context, { waitForNavigation: true })
@@ -1276,7 +1319,7 @@ class Puppeteer extends Helper {
    * @param {string} [downloadPath='downloads'] change this parameter to set another directory for saving
    */
   async handleDownloads(downloadPath = 'downloads') {
-    downloadPath = path.join(global.output_dir, downloadPath)
+    downloadPath = path.join(store.outputDir, downloadPath)
     if (!fs.existsSync(downloadPath)) {
       fs.mkdirSync(downloadPath, '0777')
     }
@@ -1338,7 +1381,7 @@ class Puppeteer extends Helper {
       },
     })
 
-    const outputFile = path.join(`${global.output_dir}/${fileName}`)
+    const outputFile = path.join(`${store.outputDir}/${fileName}`)
 
     try {
       await new Promise((resolve, reject) => {
@@ -1360,7 +1403,6 @@ class Puppeteer extends Helper {
   /**
    * {{> doubleClick }}
    *
-   * {{ react }}
    */
   async doubleClick(locator, context = null) {
     return proceedClick.call(this, locator, context, { clickCount: 2 })
@@ -1369,7 +1411,6 @@ class Puppeteer extends Helper {
   /**
    * {{> rightClick }}
    *
-   * {{ react }}
    */
   async rightClick(locator, context = null) {
     return proceedClick.call(this, locator, context, { button: 'right' })
@@ -1498,6 +1539,7 @@ class Puppeteer extends Helper {
    * {{> pressKeyWithKeyNormalization }}
    */
   async pressKey(key) {
+    await checkFocusBeforePressKey(this, key)
     const modifiers = []
     if (Array.isArray(key)) {
       for (let k of key) {
@@ -1526,6 +1568,8 @@ class Puppeteer extends Helper {
    * {{> type }}
    */
   async type(keys, delay = null) {
+    await checkFocusBeforeType(this)
+
     if (!Array.isArray(keys)) {
       keys = keys.toString()
       keys = keys.split('')
@@ -1539,12 +1583,20 @@ class Puppeteer extends Helper {
 
   /**
    * {{> fillField }}
-   * {{ react }}
    */
-  async fillField(field, value) {
-    const els = await findVisibleFields.call(this, field)
+  async fillField(field, value, context = null) {
+    let els = await findVisibleFields.call(this, field, context)
+    if (!els.length) {
+      els = await findFields.call(this, field, context)
+    }
     assertElementExists(els, field, 'Field')
-    const el = els[0]
+    const el = selectElement(els, field, this)
+
+    if (await fillRichEditor(this, el, value)) {
+      highlightActiveElement.call(this, el, await this._getContext())
+      return this._waitForAction()
+    }
+
     const tag = await el.getProperty('tagName').then(el => el.jsonValue())
     const editable = await el.getProperty('contenteditable').then(el => el.jsonValue())
     if (tag === 'INPUT' || tag === 'TEXTAREA') {
@@ -1562,38 +1614,38 @@ class Puppeteer extends Helper {
   /**
    * {{> clearField }}
    */
-  async clearField(field) {
-    return this.fillField(field, '')
+  async clearField(field, context = null) {
+    return this.fillField(field, '', context)
   }
 
   /**
    * {{> appendField }}
    *
-   * {{ react }}
    */
-  async appendField(field, value) {
-    const els = await findVisibleFields.call(this, field)
+  async appendField(field, value, context = null) {
+    const els = await findVisibleFields.call(this, field, context)
     assertElementExists(els, field, 'Field')
-    highlightActiveElement.call(this, els[0], await this._getContext())
-    await els[0].press('End')
-    await els[0].type(value.toString(), { delay: this.options.pressKeyDelay })
+    const el = selectElement(els, field, this)
+    highlightActiveElement.call(this, el, await this._getContext())
+    await el.press('End')
+    await el.type(value.toString(), { delay: this.options.pressKeyDelay })
     return this._waitForAction()
   }
 
   /**
    * {{> seeInField }}
    */
-  async seeInField(field, value) {
+  async seeInField(field, value, context = null) {
     const _value = typeof value === 'boolean' ? value : value.toString()
-    return proceedSeeInField.call(this, 'assert', field, _value)
+    return proceedSeeInField.call(this, 'assert', field, _value, context)
   }
 
   /**
    * {{> dontSeeInField }}
    */
-  async dontSeeInField(field, value) {
+  async dontSeeInField(field, value, context = null) {
     const _value = typeof value === 'boolean' ? value : value.toString()
-    return proceedSeeInField.call(this, 'negate', field, _value)
+    return proceedSeeInField.call(this, 'negate', field, _value, context)
   }
 
   /**
@@ -1601,54 +1653,75 @@ class Puppeteer extends Helper {
    *
    * {{> attachFile }}
    */
-  async attachFile(locator, pathToFile) {
-    const file = path.join(global.codecept_dir, pathToFile)
+  async attachFile(locator, pathToFile, context = null) {
+    const file = path.join(store.codeceptDir, pathToFile)
 
     if (!fileExists(file)) {
       throw new Error(`File at ${file} can not be found on local system`)
     }
-    const els = await findFields.call(this, locator)
-    assertElementExists(els, locator, 'Field')
-    await els[0].uploadFile(file)
+    const els = await findFields.call(this, locator, context)
+    if (els.length) {
+      const el = selectElement(els, locator, this)
+      const tag = await el.evaluate(el => el.tagName)
+      const type = await el.evaluate(el => el.type)
+      if (tag === 'INPUT' && type === 'file') {
+        await el.uploadFile(file)
+        return this._waitForAction()
+      }
+    }
+
+    const targetEls = els.length ? els : await this._locate(locator)
+    assertElementExists(targetEls, locator, 'Element')
+    const el = selectElement(targetEls, locator, this)
+    const fileData = {
+      base64Content: base64EncodeFile(file),
+      fileName: path.basename(file),
+      mimeType: getMimeType(path.basename(file)),
+    }
+    await el.evaluate(dropFile, fileData)
     return this._waitForAction()
   }
 
   /**
    * {{> selectOption }}
    */
-  async selectOption(select, option) {
-    const els = await findVisibleFields.call(this, select)
-    assertElementExists(els, select, 'Selectable field')
-    const el = els[0]
-    if ((await el.getProperty('tagName').then(t => t.jsonValue())) !== 'SELECT') {
-      throw new Error('Element is not <select>')
-    }
-    highlightActiveElement.call(this, els[0], await this._getContext())
-    if (!Array.isArray(option)) option = [option]
-
-    for (const key in option) {
-      const opt = xpathLocator.literal(option[key])
-      let optEl = await findElements.call(this, el, { xpath: Locator.select.byVisibleText(opt) })
-      if (optEl.length) {
-        this._evaluateHandeInContext(el => (el.selected = true), optEl[0])
-        continue
-      }
-      optEl = await findElements.call(this, el, { xpath: Locator.select.byValue(opt) })
-      if (optEl.length) {
-        this._evaluateHandeInContext(el => (el.selected = true), optEl[0])
-      }
+  async selectOption(select, option, context = null) {
+    const pageContext = await this._getContext()
+    const matchedLocator = new Locator(select)
+
+    let contextEl
+    if (context) {
+      const contextEls = await findElements.call(this, pageContext, context)
+      assertElementExists(contextEls, context, 'Context element')
+      contextEl = contextEls[0]
     }
-    await this._evaluateHandeInContext(element => {
-      element.dispatchEvent(new Event('input', { bubbles: true }))
-      element.dispatchEvent(new Event('change', { bubbles: true }))
-    }, el)
 
-    return this._waitForAction()
+    // Strict locator
+    if (!matchedLocator.isFuzzy()) {
+      this.debugSection('SelectOption', `Strict: ${JSON.stringify(select)}`)
+      const els = contextEl ? await findElements.call(this, contextEl, select) : await this._locate(select)
+      assertElementExists(els, select, 'Selectable element')
+      return proceedSelect.call(this, pageContext, selectElement(els, select, this), option)
+    }
+
+    // Fuzzy: try combobox
+    this.debugSection('SelectOption', `Fuzzy: "${matchedLocator.value}"`)
+    const comboboxSearchCtx = contextEl || pageContext
+    let els = await findByRole(comboboxSearchCtx, { role: 'combobox', name: matchedLocator.value })
+    if (els?.length) return proceedSelect.call(this, pageContext, selectElement(els, select, this), option)
+
+    // Fuzzy: try listbox
+    els = await findByRole(comboboxSearchCtx, { role: 'listbox', name: matchedLocator.value })
+    if (els?.length) return proceedSelect.call(this, pageContext, selectElement(els, select, this), option)
+
+    // Fuzzy: try native select
+    const visibleEls = await findVisibleFields.call(this, select, context)
+    assertElementExists(visibleEls, select, 'Selectable field')
+    return proceedSelect.call(this, pageContext, selectElement(visibleEls, select, this), option)
   }
 
   /**
    * {{> grabNumberOfVisibleElements }}
-   * {{ react }}
    */
   async grabNumberOfVisibleElements(locator) {
     let els = await this._locate(locator)
@@ -1687,10 +1760,29 @@ class Puppeteer extends Helper {
     urlEquals(this.options.url).negate(url, await this._getPageUrl())
   }
 
+  /**
+   * {{> seeCurrentPathEquals }}
+   */
+  async seeCurrentPathEquals(path) {
+    const currentUrl = await this._getPageUrl()
+    const baseUrl = this.options.url || 'http://localhost'
+    const actualPath = new URL(currentUrl, baseUrl).pathname
+    return equals('url path').assert(normalizePath(path), normalizePath(actualPath))
+  }
+
+  /**
+   * {{> dontSeeCurrentPathEquals }}
+   */
+  async dontSeeCurrentPathEquals(path) {
+    const currentUrl = await this._getPageUrl()
+    const baseUrl = this.options.url || 'http://localhost'
+    const actualPath = new URL(currentUrl, baseUrl).pathname
+    return equals('url path').negate(normalizePath(path), normalizePath(actualPath))
+  }
+
   /**
    * {{> see }}
    *
-   * {{ react }}
    */
   async see(text, context = null) {
     return proceedSee.call(this, 'assert', text, context)
@@ -1706,7 +1798,6 @@ class Puppeteer extends Helper {
   /**
    * {{> dontSee }}
    *
-   * {{ react }}
    */
   async dontSee(text, context = null) {
     return proceedSee.call(this, 'negate', text, context)
@@ -1760,7 +1851,6 @@ class Puppeteer extends Helper {
   /**
    * {{> seeNumberOfElements }}
    *
-   * {{ react }}
    */
   async seeNumberOfElements(locator, num) {
     const elements = await this._locate(locator)
@@ -1770,7 +1860,6 @@ class Puppeteer extends Helper {
   /**
    * {{> seeNumberOfVisibleElements }}
    *
-   * {{ react }}
    */
   async seeNumberOfVisibleElements(locator, num) {
     const res = await this.grabNumberOfVisibleElements(locator)
@@ -1897,7 +1986,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> grabTextFromAll }}
-   * {{ react }}
    */
   async grabTextFromAll(locator) {
     const els = await this._locate(locator)
@@ -1910,7 +1998,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> grabTextFrom }}
-   * {{ react }}
    */
   async grabTextFrom(locator) {
     const texts = await this.grabTextFromAll(locator)
@@ -1971,7 +2058,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> grabCssPropertyFromAll }}
-   * {{ react }}
    */
   async grabCssPropertyFromAll(locator, cssProperty) {
     const els = await this._locate(locator)
@@ -1983,7 +2069,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> grabCssPropertyFrom }}
-   * {{ react }}
    */
   async grabCssPropertyFrom(locator, cssProperty) {
     const cssValues = await this.grabCssPropertyFromAll(locator, cssProperty)
@@ -1998,7 +2083,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> seeCssPropertiesOnElements }}
-   * {{ react }}
    */
   async seeCssPropertiesOnElements(locator, cssProperties) {
     const res = await this._locate(locator)
@@ -2033,7 +2117,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> seeAttributesOnElements }}
-   * {{ react }}
    */
   async seeAttributesOnElements(locator, attributes) {
     const elements = await this._locate(locator)
@@ -2071,7 +2154,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> dragSlider }}
-   * {{ react }}
    */
   async dragSlider(locator, offsetX = 0) {
     const src = await this._locate(locator)
@@ -2093,7 +2175,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> grabAttributeFromAll }}
-   * {{ react }}
    */
   async grabAttributeFromAll(locator, attr) {
     const els = await this._locate(locator)
@@ -2107,7 +2188,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> grabAttributeFrom }}
-   * {{ react }}
    */
   async grabAttributeFrom(locator, attr) {
     const attrs = await this.grabAttributeFromAll(locator, attr)
@@ -2270,7 +2350,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> waitNumberOfVisibleElements }}
-   * {{ react }}
    */
   async waitNumberOfVisibleElements(locator, num, sec) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
@@ -2318,7 +2397,6 @@ class Puppeteer extends Helper {
 
   /**
    * {{> waitForElement }}
-   * {{ react }}
    */
   async waitForElement(locator, sec) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
@@ -2339,7 +2417,6 @@ class Puppeteer extends Helper {
   /**
    * {{> waitForVisible }}
    *
-   * {{ react }}
    */
   async waitForVisible(locator, sec) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
@@ -2424,6 +2501,7 @@ class Puppeteer extends Helper {
    */
   async waitInUrl(urlPart, sec = null) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
+    const expectedUrl = resolveUrl(urlPart, this.options.url)
 
     return this.page
       .waitForFunction(
@@ -2432,12 +2510,12 @@ class Puppeteer extends Helper {
           return currUrl.indexOf(urlPart) > -1
         },
         { timeout: waitTimeout },
-        urlPart,
+        expectedUrl,
       )
       .catch(async e => {
-        const currUrl = await this._getPageUrl() // Required because the waitForFunction can't return data.
+        const currUrl = await this._getPageUrl()
         if (/Waiting failed:/i.test(e.message) || /failed: timeout/i.test(e.message)) {
-          throw new Error(`expected url to include ${urlPart}, but found ${currUrl}`)
+          throw new Error(`expected url to include ${expectedUrl}, but found ${currUrl}`)
         } else {
           throw e
         }
@@ -2449,25 +2527,50 @@ class Puppeteer extends Helper {
    */
   async waitUrlEquals(urlPart, sec = null) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
+    const expectedUrl = resolveUrl(urlPart, this.options.url)
 
-    const baseUrl = this.options.url
-    if (urlPart.indexOf('http') < 0) {
-      urlPart = baseUrl + urlPart
-    }
+    return this.page
+      .waitForFunction(
+        url => {
+          const currUrl = decodeURIComponent(window.location.href)
+          return currUrl === url
+        },
+        { timeout: waitTimeout },
+        expectedUrl,
+      )
+      .catch(async e => {
+        const currUrl = await this._getPageUrl()
+        if (/Waiting failed/i.test(e.message) || /failed: timeout/i.test(e.message)) {
+          throw new Error(`expected url to be ${expectedUrl}, but found ${currUrl}`)
+        } else {
+          throw e
+        }
+      })
+  }
+
+  /**
+   * {{> waitCurrentPathEquals }}
+   */
+  async waitCurrentPathEquals(path, sec = null) {
+    const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
+    const normalizedPath = normalizePath(path)
 
     return this.page
       .waitForFunction(
-        urlPart => {
-          const currUrl = decodeURIComponent(decodeURIComponent(decodeURIComponent(window.location.href)))
-          return currUrl.indexOf(urlPart) > -1
+        expectedPath => {
+          const actualPath = window.location.pathname
+          const normalizePath = p => (p === '' || p === '/' ? '/' : p.replace(/\/+/g, '/').replace(/\/$/, '') || '/')
+          return normalizePath(actualPath) === expectedPath
         },
         { timeout: waitTimeout },
-        urlPart,
+        normalizedPath,
       )
       .catch(async e => {
-        const currUrl = await this._getPageUrl() // Required because the waitForFunction can't return data.
+        const currUrl = await this._getPageUrl()
+        const baseUrl = this.options.url || 'http://localhost'
+        const actualPath = new URL(currUrl, baseUrl).pathname
         if (/Waiting failed/i.test(e.message) || /failed: timeout/i.test(e.message)) {
-          throw new Error(`expected url to be ${urlPart}, but found ${currUrl}`)
+          throw new Error(`expected path to be ${normalizedPath}, but found ${normalizePath(actualPath)}`)
         } else {
           throw e
         }
@@ -2890,15 +2993,18 @@ export default Puppeteer
  * @returns {Promise<Array>} Array of ElementHandle objects
  */
 async function findElements(matcher, locator) {
-  // Check if locator is a Locator object with react type, or a raw object with react property
-  const isReactLocator = locator.type === 'react' || (locator.locator && locator.locator.react) || locator.react
-  if (isReactLocator) return findReactElements.call(this, locator)
-  
   locator = new Locator(locator, 'css')
-  
+
   // Check if locator is a role locator and call findByRole
   if (locator.isRole()) return findByRole.call(this, matcher, locator)
 
+  // Handle shadow DOM locators with >>> deep descendant combinator
+  // { shadow: ['my-app', 'recipe-hello', 'button'] } => 'my-app >>> recipe-hello >>> button'
+  if (locator.isShadow()) {
+    const shadowSelector = locator.value.join(' >>> ')
+    return matcher.$$(shadowSelector)
+  }
+
   // Use proven legacy approach - Puppeteer Locator API doesn't have .all() method
   if (!locator.isXPath()) return matcher.$$(locator.simplify())
   
@@ -2953,7 +3059,6 @@ async function findElements(matcher, locator) {
  * @returns {Promise<Object>} Single ElementHandle object
  */
 async function findElement(matcher, locator) {
-  if (locator.react) return findReactElements.call(this, locator)
   locator = new Locator(locator, 'css')
 
   // Check if locator is a role locator and call findByRole
@@ -2962,6 +3067,13 @@ async function findElement(matcher, locator) {
     return elements[0]
   }
 
+  // Handle shadow DOM locators with >>> deep descendant combinator
+  if (locator.isShadow()) {
+    const shadowSelector = locator.value.join(' >>> ')
+    const elements = await matcher.$$(shadowSelector)
+    return elements[0]
+  }
+
   // Use proven legacy approach - Puppeteer Locator API doesn't have .first() method
   if (!locator.isXPath()) {
     const elements = await matcher.$$(locator.simplify())
@@ -2990,10 +3102,11 @@ async function proceedClick(locator, context = null, options = {}) {
   } else {
     assertElementExists(els, locator, 'Clickable element')
   }
+  const el = selectElement(els, locator, this)
 
-  highlightActiveElement.call(this, els[0], await this._getContext())
+  highlightActiveElement.call(this, el, await this._getContext())
 
-  await els[0].click(options)
+  await el.click(options)
   const promises = []
   if (options.waitForNavigation) {
     promises.push(this.waitForNavigation())
@@ -3124,43 +3237,57 @@ async function proceedIsChecked(assertType, option) {
   return truth(`checkable ${option}`, 'to be checked')[assertType](selected)
 }
 
-async function findVisibleFields(locator) {
-  const els = await findFields.call(this, locator)
+async function findVisibleFields(locator, context = null) {
+  const els = await findFields.call(this, locator, context)
   const visible = await Promise.all(els.map(el => el.boundingBox()))
   return els.filter((el, index) => visible[index])
 }
 
-async function findFields(locator) {
+async function findFields(locator, context = null) {
+  let contextEl
+  if (context) {
+    const contextPage = await this.context
+    const contextEls = await findElements.call(this, contextPage, context)
+    assertElementExists(contextEls, context, 'Context element')
+    contextEl = contextEls[0]
+  }
+
+  const locateFn = contextEl
+    ? loc => findElements.call(this, contextEl, loc)
+    : loc => this._locate(loc)
+
   const matchedLocator = new Locator(locator)
   if (!matchedLocator.isFuzzy()) {
-    return this._locate(matchedLocator)
+    return locateFn(matchedLocator)
   }
   const literal = xpathLocator.literal(matchedLocator.value)
 
-  let els = await this._locate({ xpath: Locator.field.labelEquals(literal) })
+  let els = await locateFn({ xpath: Locator.field.labelEquals(literal) })
   if (els.length) {
     return els
   }
 
-  els = await this._locate({ xpath: Locator.field.labelContains(literal) })
+  els = await locateFn({ xpath: Locator.field.labelContains(literal) })
   if (els.length) {
     return els
   }
-  els = await this._locate({ xpath: Locator.field.byName(literal) })
+  els = await locateFn({ xpath: Locator.field.byName(literal) })
   if (els.length) {
     return els
   }
 
   // Try ARIA selector for accessible name
-  try {
-    const page = await this.context
-    els = await page.$$(`::-p-aria(${matchedLocator.value})`)
-    if (els.length) return els
-  } catch (err) {
-    // ARIA selector not supported or failed
+  if (!contextEl) {
+    try {
+      const page = await this.context
+      els = await page.$$(`::-p-aria(${matchedLocator.value})`)
+      if (els.length) return els
+    } catch (err) {
+      // ARIA selector not supported or failed
+    }
   }
 
-  return this._locate({ css: matchedLocator.value })
+  return locateFn({ css: matchedLocator.value })
 }
 
 async function proceedDragAndDrop(sourceLocator, destinationLocator) {
@@ -3189,8 +3316,8 @@ async function proceedDragAndDrop(sourceLocator, destinationLocator) {
   await this._waitForAction()
 }
 
-async function proceedSeeInField(assertType, field, value) {
-  const els = await findVisibleFields.call(this, field)
+async function proceedSeeInField(assertType, field, value, context) {
+  const els = await findVisibleFields.call(this, field, context)
   assertElementExists(els, field, 'Field')
   const el = els[0]
   const tag = await el.getProperty('tagName').then(el => el.jsonValue())
@@ -3303,6 +3430,13 @@ function assertElementExists(res, locator, prefix, suffix) {
   }
 }
 
+function assertOnlyOneElement(elements, locator, helper) {
+  if (elements.length > 1) {
+    const webElements = elements.map(el => new WebElement(el, helper))
+    throw new MultipleElementsFound(locator, webElements)
+  }
+}
+
 function $XPath(element, selector) {
   const found = document.evaluate(selector, element || document.body, null, 5, null)
   const res = []
@@ -3410,7 +3544,7 @@ function getNormalizedKey(key) {
 }
 
 function highlightActiveElement(element, context) {
-  if (this.options.highlightElement && global.debugMode) {
+  if (this.options.highlightElement && store.debugMode) {
     highlightElement(element, context)
   }
 }
@@ -3423,75 +3557,6 @@ function _waitForElement(locator, options) {
   }
 }
 
-async function findReactElements(locator) {
-  // Handle both Locator objects and raw locator objects
-  const resolved = locator.locator ? locator.locator : toLocatorConfig(locator, 'react')
-  this.debug(`Finding React elements: ${JSON.stringify(resolved)}`)
-
-  // Use createRequire to access require.resolve in ESM
-  const { createRequire } = await import('module')
-  const require = createRequire(import.meta.url)
-  const resqScript = await fs.promises.readFile(require.resolve('resq'), 'utf-8')
-  await this.page.evaluate(resqScript.toString())
-
-  await this.page.evaluate(() => window.resq.waitToLoadReact())
-  const arrayHandle = await this.page.evaluateHandle(
-    obj => {
-      const { selector, props, state } = obj
-      let elements = window.resq.resq$$(selector)
-      if (Object.keys(props).length) {
-        elements = elements.byProps(props)
-      }
-      if (Object.keys(state).length) {
-        elements = elements.byState(state)
-      }
-
-      if (!elements.length) {
-        return []
-      }
-
-      // resq returns an array of HTMLElements if the React component is a fragment
-      // this avoids having nested arrays of nodes which the driver does not understand
-      // [[div, div], [div, div]] => [div, div, div, div]
-      let nodes = []
-
-      elements.forEach(element => {
-        let { node, isFragment } = element
-
-        if (!node) {
-          isFragment = true
-          node = element.children
-        }
-
-        if (isFragment) {
-          nodes = nodes.concat(node)
-        } else {
-          nodes.push(node)
-        }
-      })
-
-      return [...nodes]
-    },
-    {
-      selector: resolved.react,
-      props: resolved.props || {},
-      state: resolved.state || {},
-    },
-  )
-
-  const properties = await arrayHandle.getProperties()
-  const result = []
-  for (const property of properties.values()) {
-    const elementHandle = property.asElement()
-    if (elementHandle) {
-      result.push(elementHandle)
-    }
-  }
-
-  await arrayHandle.dispose()
-  return result
-}
-
 async function findByRole(matcher, locator) {
   const resolved = toLocatorConfig(locator, 'role')
   const roleSelector = buildRoleSelector(resolved)
@@ -3541,3 +3606,81 @@ function createRoleTextMatcher(expected, exactMatch) {
   return value => typeof value === 'string' && value.includes(target)
 }
 
+async function proceedSelect(context, el, option) {
+  const role = await el.evaluate(e => e.getAttribute('role'))
+  const options = Array.isArray(option) ? option : [option]
+
+  if (role === 'combobox') {
+    this.debugSection('SelectOption', 'Expanding combobox')
+    highlightActiveElement.call(this, el, context)
+    const ariaOwns = await el.evaluate(e => e.getAttribute('aria-owns'))
+    const ariaControls = await el.evaluate(e => e.getAttribute('aria-controls'))
+    await el.click()
+    await this._waitForAction()
+
+    const listboxId = ariaOwns || ariaControls
+    let listbox = null
+    if (listboxId) {
+      const listboxEls = await context.$$( `#${listboxId}`)
+      if (listboxEls.length) listbox = listboxEls[0]
+    }
+    if (!listbox) {
+      const listboxEls = await findByRole.call(this, context, { role: 'listbox' })
+      if (listboxEls?.length) listbox = listboxEls[0]
+    }
+
+    if (listbox) {
+      for (const opt of options) {
+        const optEls = await findByRole.call(this, listbox, { role: 'option', name: opt })
+        if (optEls?.length) {
+          const optEl = optEls[0]
+          this.debugSection('SelectOption', `Clicking: "${opt}"`)
+          highlightActiveElement.call(this, optEl, context)
+          await optEl.click()
+        }
+      }
+    }
+    return this._waitForAction()
+  }
+
+  if (role === 'listbox') {
+    for (const opt of options) {
+      const optEls = await findByRole.call(this, el, { role: 'option', name: opt })
+      if (optEls?.length) {
+        const optEl = optEls[0]
+        this.debugSection('SelectOption', `Clicking: "${opt}"`)
+        highlightActiveElement.call(this, optEl, context)
+        await optEl.click()
+      }
+    }
+    return this._waitForAction()
+  }
+
+  // Native <select> element
+  const tagName = await el.evaluate(e => e.tagName)
+  if (tagName !== 'SELECT') {
+    throw new Error('Element is not <select>')
+  }
+  highlightActiveElement.call(this, el, context)
+  const optionArray = Array.isArray(option) ? option : [option]
+
+  for (const key in optionArray) {
+    const opt = xpathLocator.literal(optionArray[key])
+    let optEl = await findElements.call(this, el, { xpath: Locator.select.byVisibleText(opt) })
+    if (optEl.length) {
+      this._evaluateHandeInContext(el => (el.selected = true), optEl[0])
+      continue
+    }
+    optEl = await findElements.call(this, el, { xpath: Locator.select.byValue(opt) })
+    if (optEl.length) {
+      this._evaluateHandeInContext(el => (el.selected = true), optEl[0])
+    }
+  }
+  await this._evaluateHandeInContext(element => {
+    element.dispatchEvent(new Event('input', { bubbles: true }))
+    element.dispatchEvent(new Event('change', { bubbles: true }))
+  }, el)
+
+  return this._waitForAction()
+}
+