Fix waitForText timeout regression in Playwright helper

Author: Copilot

lib/helper/Playwright.js

@@ -2795,42 +2795,20 @@ class Playwright extends Helper {
       }
     }
 
-    const timeoutGap = waitTimeout + 1000
-
-    // We add basic timeout to make sure we don't wait forever
-    // We apply 2 strategies here: wait for text as innert text on page (wide strategy) - older
-    // or we use native Playwright matcher to wait for text in element (narrow strategy) - newer
-    // If a user waits for text on a page they are mostly expect it to be there, so wide strategy can be helpful even PW strategy is available
-
-    // Use a flag to stop retries when race resolves
-    let shouldStop = false
-    let timeoutId
-
-    const racePromise = Promise.race([
-      new Promise((_, reject) => {
-        timeoutId = setTimeout(() => reject(errorMessage), waitTimeout)
-      }),
-      this.page.waitForFunction(text => document.body && document.body.innerText.indexOf(text) > -1, text, { timeout: timeoutGap }),
-      promiseRetry(
-        async (retry, number) => {
-          // Stop retrying if race has resolved
-          if (shouldStop) {
-            throw new Error('Operation cancelled')
-          }
-          const textPresent = await contextObject
-            .locator(`:has-text(${JSON.stringify(text)})`)
-            .first()
-            .isVisible()
-          if (!textPresent) retry(errorMessage)
-        },
-        { retries: 10, minTimeout: 100, maxTimeout: 500, factor: 1.5 },
-      ),
-    ])
-
-    // Clean up when race resolves/rejects
-    return racePromise.finally(() => {
-      if (timeoutId) clearTimeout(timeoutId)
-      shouldStop = true
+    // Use a simple Promise.race with two complementary strategies:
+    // 1. page.waitForFunction - checks document.body.innerText (broad search)
+    // 2. contextObject.locator with :has-text - uses Playwright's native text matching
+    // Both approaches will wait for the full timeout duration
+    return Promise.race([
+      // Strategy 1: Check document body innerText
+      this.page.waitForFunction(text => document.body && document.body.innerText.indexOf(text) > -1, text, { timeout: waitTimeout }),
+      // Strategy 2: Use Playwright's native text locator
+      contextObject
+        .locator(`:has-text(${JSON.stringify(text)})`)
+        .first()
+        .waitFor({ timeout: waitTimeout, state: 'visible' }),
+    ]).catch(err => {
+      throw new Error(errorMessage)
     })
   }
 

test/helper/Playwright_test.js

@@ -778,6 +778,30 @@ describe('Playwright', function () {
         .then(() => I.seeInField('#text2', 'London')))
   })
 
+  describe('#waitForText timeout fix', () => {
+    it('should wait for the full timeout duration when text is not found', async function () {
+      this.timeout(10000) // Allow up to 10 seconds for this test
+
+      const startTime = Date.now()
+      const timeoutSeconds = 3 // 3 second timeout
+
+      try {
+        await I.amOnPage('/')
+        await I.waitForText('ThisTextDoesNotExistAnywhere12345', timeoutSeconds)
+        // Should not reach here
+        throw new Error('waitForText should have thrown an error')
+      } catch (error) {
+        const elapsedTime = Date.now() - startTime
+        const expectedTimeout = timeoutSeconds * 1000
+
+        // Verify it waited close to the full timeout (allow 500ms tolerance)
+        assert.ok(elapsedTime >= expectedTimeout - 500, `Expected to wait at least ${expectedTimeout - 500}ms, but waited ${elapsedTime}ms`)
+        assert.ok(elapsedTime <= expectedTimeout + 1000, `Expected to wait at most ${expectedTimeout + 1000}ms, but waited ${elapsedTime}ms`)
+        assert.ok(error.message.includes('was not found on page after'), `Expected error message about text not found, got: ${error.message}`)
+      }
+    })
+  })
+
   describe('#grabHTMLFrom', () => {
     it('should grab inner html from an element using xpath query', () =>
       I.amOnPage('/')