fix(playwright): no context is used for wait* functions

Author: kobenguyent

lib/helper/Playwright.js

@@ -900,7 +900,7 @@ class Playwright extends Helper {
   }
 
   async _evaluateHandeInContext(...args) {
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     return context.evaluateHandle(...args)
   }
 
@@ -1327,7 +1327,7 @@ class Playwright extends Helper {
    * ```
    */
   async _locateClickable(locator) {
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     return findClickable.call(this, context, locator)
   }
 
@@ -2478,7 +2478,7 @@ class Playwright extends Helper {
     locator = new Locator(locator, 'css')
 
     let waiter
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (!locator.isXPath()) {
       const valueFn = function ([locator]) {
         return Array.from(document.querySelectorAll(locator)).filter((el) => !el.disabled).length > 0
@@ -2506,7 +2506,7 @@ class Playwright extends Helper {
     locator = new Locator(locator, 'css')
 
     let waiter
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (!locator.isXPath()) {
       const valueFn = function ([locator]) {
         return Array.from(document.querySelectorAll(locator)).filter((el) => el.disabled).length > 0
@@ -2534,7 +2534,7 @@ class Playwright extends Helper {
     const locator = new Locator(field, 'css')
     const matcher = await this.context
     let waiter
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (!locator.isXPath()) {
       const valueFn = function ([locator, value]) {
         return (
@@ -2569,7 +2569,7 @@ class Playwright extends Helper {
     locator = new Locator(locator, 'css')
 
     let waiter
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (locator.isCSS()) {
       const visibleFn = function ([locator, num]) {
         const els = document.querySelectorAll(locator)
@@ -2613,7 +2613,7 @@ class Playwright extends Helper {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     locator = new Locator(locator, 'css')
 
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     try {
       await context.locator(buildLocatorString(locator)).first().waitFor({ timeout: waitTimeout, state: 'attached' })
     } catch (e) {
@@ -2631,7 +2631,7 @@ class Playwright extends Helper {
   async waitForVisible(locator, sec) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     locator = new Locator(locator, 'css')
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     let count = 0
 
     // we have this as https://github.com/microsoft/playwright/issues/26829 is not yet implemented
@@ -2660,7 +2660,7 @@ class Playwright extends Helper {
   async waitForInvisible(locator, sec) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     locator = new Locator(locator, 'css')
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     let waiter
     let count = 0
 
@@ -2690,7 +2690,7 @@ class Playwright extends Helper {
   async waitToHide(locator, sec) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     locator = new Locator(locator, 'css')
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     let waiter
     let count = 0
 
@@ -2956,7 +2956,7 @@ class Playwright extends Helper {
       }
     }
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     return context.waitForFunction(fn, args, { timeout: waitTimeout })
   }
 
@@ -3010,7 +3010,7 @@ class Playwright extends Helper {
     locator = new Locator(locator, 'css')
 
     let waiter
-    const context = await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (!locator.isXPath()) {
       try {
         await context

test/helper/Playwright_test.js

@@ -37,7 +37,7 @@ describe('Playwright', function () {
 
     I = new Playwright({
       url: siteUrl,
-      windowSize: '500x700',
+      //windowSize: '500x700',
       browser: process.env.BROWSER || 'chromium',
       show: false,
       waitForTimeout: 5000,
@@ -205,6 +205,17 @@ describe('Playwright', function () {
 
       await I.waitToHide('h9')
     })
+
+    it('should wait for invisible combined with dontseeElement', async () => {
+      await I.amOnPage('https://codecept.io/')
+      await I.waitForVisible('.frameworks')
+      await I.waitForVisible('[alt="React"]')
+      await I.waitForVisible('.mountains')
+      await I._withinBegin('.mountains', async () => {
+        await I.dontSeeElement('[alt="React"]')
+        await I.waitForInvisible('[alt="React"]', 2)
+      })
+    })
   })
 
   describe('#waitToHide', () => {