From cd67c4387552f1ff409d6a68f3a20582fa077c92 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Mon, 11 Nov 2024 11:31:44 +0100
Subject: [PATCH 1/7] fix(playwright): no context is used for wait* functions

---
 lib/helper/Playwright.js       | 24 ++++++++++++------------
 test/helper/Playwright_test.js | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 5210fb69c..3dfb7a768 100644
--- a/lib/helper/Playwright.js
+++ b/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
diff --git a/test/helper/Playwright_test.js b/test/helper/Playwright_test.js
index d36bd4347..dd8a5ae23 100644
--- a/test/helper/Playwright_test.js
+++ b/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', () => {

From 6d590bf0a5b72b995cc69d99de20cfd5e75e1dbd Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Mon, 11 Nov 2024 11:32:27 +0100
Subject: [PATCH 2/7] fix(playwright): no context is used for wait* functions

---
 test/helper/Playwright_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/helper/Playwright_test.js b/test/helper/Playwright_test.js
index dd8a5ae23..b410244d4 100644
--- a/test/helper/Playwright_test.js
+++ b/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,

From 7667cada5b3406c60ccfe103484f66d6a6b3d701 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Mon, 11 Nov 2024 11:39:36 +0100
Subject: [PATCH 3/7] fix(ppt): no context is used for wait* functions

---
 lib/helper/Puppeteer.js       | 20 ++++++++++----------
 test/helper/Puppeteer_test.js | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/helper/Puppeteer.js b/lib/helper/Puppeteer.js
index 9bc82b69d..369cc240d 100644
--- a/lib/helper/Puppeteer.js
+++ b/lib/helper/Puppeteer.js
@@ -626,7 +626,7 @@ class Puppeteer extends Helper {
   }
 
   async _evaluateHandeInContext(...args) {
-    const context = await this._getContext()
+    const context = await this.context || await this._getContext()
     return context.evaluateHandle(...args)
   }
 
@@ -2094,7 +2094,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
     await this.context
     let waiter
-    const context = await this._getContext()
+    const context = await this.context || await this._getContext()
     if (locator.isCSS()) {
       const enabledFn = function (locator) {
         const els = document.querySelectorAll(locator)
@@ -2126,7 +2126,7 @@ class Puppeteer extends Helper {
     const locator = new Locator(field, 'css')
     await this.context
     let waiter
-    const context = await this._getContext()
+    const context = await this.context || await this._getContext()
     if (locator.isCSS()) {
       const valueFn = function (locator, value) {
         const els = document.querySelectorAll(locator)
@@ -2159,7 +2159,7 @@ class Puppeteer extends Helper {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     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)
@@ -2210,7 +2210,7 @@ class Puppeteer 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()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout })
     } else {
@@ -2233,7 +2233,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
     await this.context
     let waiter
-    const context = await this._getContext()
+    const context = await this.context || await this._getContext()
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout, visible: true })
     } else {
@@ -2254,7 +2254,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
     await this.context
     let waiter
-    const context = await this._getContext()
+    const context = await this.context || await this._getContext()
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout, hidden: true })
     } else {
@@ -2272,7 +2272,7 @@ class Puppeteer extends Helper {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     locator = new Locator(locator, 'css')
     let waiter
-    const context = await this._getContext()
+    const context = await this.context || await this._getContext()
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout, hidden: true })
     } else {
@@ -2501,7 +2501,7 @@ class Puppeteer 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, { timeout: waitTimeout }, ...args)
   }
 
@@ -2536,7 +2536,7 @@ class Puppeteer 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) {
         return document.querySelector(locator) === null
diff --git a/test/helper/Puppeteer_test.js b/test/helper/Puppeteer_test.js
index 9d3ff1aca..01588fb55 100644
--- a/test/helper/Puppeteer_test.js
+++ b/test/helper/Puppeteer_test.js
@@ -32,7 +32,7 @@ describe('Puppeteer - BasicAuth', function () {
 
     I = new Puppeteer({
       url: siteUrl,
-      windowSize: '500x700',
+      // windowSize: '500x700',
       show: false,
       waitForTimeout: 5000,
       waitForAction: 500,
@@ -193,6 +193,17 @@ describe('Puppeteer', function () {
         .then(() => I.dontSeeElement('//div[@id="step_1"]'))
         .then(() => I.dontSee('Step One Button'))
     })
+
+    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('#waitNumberOfVisibleElements', () => {

From 8d81ed4ea1069f74b2c4b86c43c44c6773553132 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Mon, 11 Nov 2024 11:40:24 +0100
Subject: [PATCH 4/7] fix(ppt): no context is used for wait* functions

---
 lib/helper/Puppeteer.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/helper/Puppeteer.js b/lib/helper/Puppeteer.js
index 369cc240d..ce4852d5a 100644
--- a/lib/helper/Puppeteer.js
+++ b/lib/helper/Puppeteer.js
@@ -626,7 +626,7 @@ class Puppeteer extends Helper {
   }
 
   async _evaluateHandeInContext(...args) {
-    const context = await this.context || await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     return context.evaluateHandle(...args)
   }
 
@@ -2094,7 +2094,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
     await this.context
     let waiter
-    const context = await this.context || await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (locator.isCSS()) {
       const enabledFn = function (locator) {
         const els = document.querySelectorAll(locator)
@@ -2126,7 +2126,7 @@ class Puppeteer extends Helper {
     const locator = new Locator(field, 'css')
     await this.context
     let waiter
-    const context = await this.context || await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (locator.isCSS()) {
       const valueFn = function (locator, value) {
         const els = document.querySelectorAll(locator)
@@ -2159,7 +2159,7 @@ class Puppeteer extends Helper {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     locator = new Locator(locator, 'css')
     let waiter
-    const context = await this.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)
@@ -2210,7 +2210,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
 
     let waiter
-    const context = await this.context || await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout })
     } else {
@@ -2233,7 +2233,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
     await this.context
     let waiter
-    const context = await this.context || await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout, visible: true })
     } else {
@@ -2254,7 +2254,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
     await this.context
     let waiter
-    const context = await this.context || await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout, hidden: true })
     } else {
@@ -2272,7 +2272,7 @@ class Puppeteer extends Helper {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     locator = new Locator(locator, 'css')
     let waiter
-    const context = await this.context || await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout, hidden: true })
     } else {
@@ -2501,7 +2501,7 @@ class Puppeteer extends Helper {
       }
     }
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
-    const context = await this.context || await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     return context.waitForFunction(fn, { timeout: waitTimeout }, ...args)
   }
 
@@ -2536,7 +2536,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
 
     let waiter
-    const context = await this.context || await this._getContext()
+    const context = (await this.context) || (await this._getContext())
     if (locator.isCSS()) {
       const visibleFn = function (locator) {
         return document.querySelector(locator) === null

From c7e58aba4dcf5a63ff1034858ced131c62b99416 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Mon, 11 Nov 2024 11:53:13 +0100
Subject: [PATCH 5/7] fix(ppt): no context is used for wait* functions

---
 lib/helper/Playwright.js | 30 +++++++++++++++---------------
 lib/helper/Puppeteer.js  | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 3dfb7a768..a30e0eb6d 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -900,7 +900,7 @@ class Playwright extends Helper {
   }
 
   async _evaluateHandeInContext(...args) {
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     return context.evaluateHandle(...args)
   }
 
@@ -1284,7 +1284,7 @@ class Playwright extends Helper {
    * ```
    */
   async _locate(locator) {
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
 
     if (this.frame) return findElements(this.frame, locator)
 
@@ -1300,7 +1300,7 @@ class Playwright extends Helper {
    * ```
    */
   async _locateElement(locator) {
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     return findElement(context, locator)
   }
 
@@ -1327,7 +1327,7 @@ class Playwright extends Helper {
    * ```
    */
   async _locateClickable(locator) {
-    const context = (await this.context) || (await this._getContext())
+    const 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.context) || (await this._getContext())
+    const 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.context) || (await this._getContext())
+    const 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.context) || (await this._getContext())
+    const 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.context) || (await this._getContext())
+    const 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.context) || (await this._getContext())
+    const 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.context) || (await this._getContext())
+    const 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.context) || (await this._getContext())
+    const 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.context) || (await this._getContext())
+    const context = await this._getContext()
     let waiter
     let count = 0
 
@@ -2737,7 +2737,7 @@ class Playwright extends Helper {
   }
 
   async _getContext() {
-    if (this.context && this.context.constructor.name === 'FrameLocator') {
+    if (this.context && this.context.constructor.name === 'FrameLocator' || this.context) {
       return this.context
     }
     return this.page
@@ -2956,7 +2956,7 @@ class Playwright extends Helper {
       }
     }
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
-    const context = (await this.context) || (await this._getContext())
+    const 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.context) || (await this._getContext())
+    const context = await this._getContext()
     if (!locator.isXPath()) {
       try {
         await context
diff --git a/lib/helper/Puppeteer.js b/lib/helper/Puppeteer.js
index ce4852d5a..9bc82b69d 100644
--- a/lib/helper/Puppeteer.js
+++ b/lib/helper/Puppeteer.js
@@ -626,7 +626,7 @@ class Puppeteer extends Helper {
   }
 
   async _evaluateHandeInContext(...args) {
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     return context.evaluateHandle(...args)
   }
 
@@ -2094,7 +2094,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
     await this.context
     let waiter
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     if (locator.isCSS()) {
       const enabledFn = function (locator) {
         const els = document.querySelectorAll(locator)
@@ -2126,7 +2126,7 @@ class Puppeteer extends Helper {
     const locator = new Locator(field, 'css')
     await this.context
     let waiter
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     if (locator.isCSS()) {
       const valueFn = function (locator, value) {
         const els = document.querySelectorAll(locator)
@@ -2159,7 +2159,7 @@ class Puppeteer extends Helper {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     locator = new Locator(locator, 'css')
     let waiter
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     if (locator.isCSS()) {
       const visibleFn = function (locator, num) {
         const els = document.querySelectorAll(locator)
@@ -2210,7 +2210,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
 
     let waiter
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout })
     } else {
@@ -2233,7 +2233,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
     await this.context
     let waiter
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout, visible: true })
     } else {
@@ -2254,7 +2254,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
     await this.context
     let waiter
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout, hidden: true })
     } else {
@@ -2272,7 +2272,7 @@ class Puppeteer extends Helper {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
     locator = new Locator(locator, 'css')
     let waiter
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     if (locator.isCSS()) {
       waiter = context.waitForSelector(locator.simplify(), { timeout: waitTimeout, hidden: true })
     } else {
@@ -2501,7 +2501,7 @@ class Puppeteer extends Helper {
       }
     }
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     return context.waitForFunction(fn, { timeout: waitTimeout }, ...args)
   }
 
@@ -2536,7 +2536,7 @@ class Puppeteer extends Helper {
     locator = new Locator(locator, 'css')
 
     let waiter
-    const context = (await this.context) || (await this._getContext())
+    const context = await this._getContext()
     if (locator.isCSS()) {
       const visibleFn = function (locator) {
         return document.querySelector(locator) === null

From 56324b679ee182a7767c9571cc608bbe1d6b55bf Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Mon, 11 Nov 2024 11:54:26 +0100
Subject: [PATCH 6/7] fix(playwright): no context is used for wait* functions

---
 lib/helper/Playwright.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index a30e0eb6d..0a946928b 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -2737,7 +2737,7 @@ class Playwright extends Helper {
   }
 
   async _getContext() {
-    if (this.context && this.context.constructor.name === 'FrameLocator' || this.context) {
+    if ((this.context && this.context.constructor.name === 'FrameLocator') || this.context) {
       return this.context
     }
     return this.page

From bcd6bd60d241c596105ef88f00b008a6304c885e Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Mon, 11 Nov 2024 12:10:10 +0100
Subject: [PATCH 7/7] fix(ppt): no context is used for wait* functions

---
 test/helper/Puppeteer_test.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/test/helper/Puppeteer_test.js b/test/helper/Puppeteer_test.js
index 01588fb55..6410c4f14 100644
--- a/test/helper/Puppeteer_test.js
+++ b/test/helper/Puppeteer_test.js
@@ -193,17 +193,6 @@ describe('Puppeteer', function () {
         .then(() => I.dontSeeElement('//div[@id="step_1"]'))
         .then(() => I.dontSee('Step One Button'))
     })
-
-    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('#waitNumberOfVisibleElements', () => {