Implemented by role selector and aria locators with tests

Author: DavertMik

lib/helper/Playwright.js

@@ -2425,24 +2425,27 @@ class Playwright extends Helper {
    */
   async grabTextFrom(locator) {
     const originalLocator = locator
-    if (typeof locator === 'object' && (locator.role || locator.react || locator.vue || locator.pw)) {
-      const els = await this._locate(locator)
+    const matchedLocator = new Locator(locator)
+
+    if (!matchedLocator.isFuzzy()) {
+      const els = await this._locate(matchedLocator)
       assertElementExists(els, locator)
       const text = await els[0].innerText()
       this.debugSection('Text', text)
       return text
     }
-    locator = this._contextLocator(locator)
+
+    const contextAwareLocator = this._contextLocator(matchedLocator.value)
     let text
     try {
-      text = await this.page.textContent(locator)
+      text = await this.page.textContent(contextAwareLocator)
     } catch (err) {
       if (err.message.includes('Timeout') || err.message.includes('exceeded')) {
         throw new Error(`Element ${new Locator(originalLocator).toString()} was not found by text|CSS|XPath`)
       }
       throw err
     }
-    assertElementExists(text, locator)
+    assertElementExists(text, contextAwareLocator)
     this.debugSection('Text', text)
     return text
   }
@@ -3865,26 +3868,22 @@ async function proceedClick(locator, context = null, options = {}) {
 }
 
 async function findClickable(matcher, locator) {
-  if (locator.react) return findReact(matcher, locator)
-  if (locator.vue) return findVue(matcher, locator)
-  if (locator.pw) return findByPlaywrightLocator.call(this, matcher, locator)
-  if (locator.role) return findByRole(matcher, locator)
+  const matchedLocator = new Locator(locator)
 
-  locator = new Locator(locator)
-  if (!locator.isFuzzy()) return findElements.call(this, matcher, locator)
+  if (!matchedLocator.isFuzzy()) return findElements.call(this, matcher, matchedLocator)
 
   let els
-  const literal = xpathLocator.literal(locator.value)
+  const literal = xpathLocator.literal(matchedLocator.value)
 
   try {
-    els = await matcher.getByRole('button', { name: locator.value }).all()
+    els = await matcher.getByRole('button', { name: matchedLocator.value }).all()
     if (els.length) return els
   } catch (err) {
     // getByRole not supported or failed
   }
 
   try {
-    els = await matcher.getByRole('link', { name: locator.value }).all()
+    els = await matcher.getByRole('link', { name: matchedLocator.value }).all()
     if (els.length) return els
   } catch (err) {
     // getByRole not supported or failed
@@ -3903,7 +3902,7 @@ async function findClickable(matcher, locator) {
     // Do nothing
   }
 
-  return findElements.call(this, matcher, locator.value) // by css or xpath
+  return findElements.call(this, matcher, matchedLocator.value) // by css or xpath
 }
 
 async function proceedSee(assertType, text, context, strict = false) {
@@ -3942,16 +3941,12 @@ async function findCheckable(locator, context) {
     contextEl = contextEl[0]
   }
 
-  if (typeof locator === 'object' && (locator.role || locator.react || locator.vue || locator.pw)) {
-    return findElements.call(this, contextEl, locator)
-  }
-
   const matchedLocator = new Locator(locator)
   if (!matchedLocator.isFuzzy()) {
-    return findElements.call(this, contextEl, matchedLocator.simplify())
+    return findElements.call(this, contextEl, matchedLocator)
   }
 
-  const literal = xpathLocator.literal(locator)
+  const literal = xpathLocator.literal(matchedLocator.value)
   let els = await findElements.call(this, contextEl, Locator.checkable.byText(literal))
   if (els.length) {
     return els
@@ -3960,7 +3955,7 @@ async function findCheckable(locator, context) {
   if (els.length) {
     return els
   }
-  return findElements.call(this, contextEl, locator)
+  return findElements.call(this, contextEl, matchedLocator.value)
 }
 
 async function proceedIsChecked(assertType, option) {
@@ -3972,9 +3967,6 @@ async function proceedIsChecked(assertType, option) {
 }
 
 async function findFields(locator) {
-  if (typeof locator === 'object' && (locator.role || locator.react || locator.vue || locator.pw)) {
-    return this._locate(locator)
-  }
   const matchedLocator = new Locator(locator)
   if (!matchedLocator.isFuzzy()) {
     return this._locate(matchedLocator)