From cbb069c23c035edacafd3e1551a506c85793a6e1 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Tue, 26 Sep 2023 11:04:05 +0200
Subject: [PATCH 01/12] fix: switchTo

---
 lib/helper/Playwright.js       | 2 +-
 test/helper/Playwright_test.js | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index a1b7837e9..a738b4227 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -2558,7 +2558,7 @@ class Playwright extends Helper {
 
     // get content of the first iframe
     locator = new Locator(locator, 'css');
-    if ((locator.frame && locator.frame === 'iframe') || locator.value.toLowerCase() === 'iframe') {
+    if ((locator.frame && locator.frame === 'iframe') || locator.value.toLowerCase() === 'iframe' || locator.value.toLowerCase().includes('iframe')) {
       contentFrame = await this.page.frames()[1];
       // get content of the iframe using its name
     } else if (locator.value.toLowerCase().includes('name=')) {
diff --git a/test/helper/Playwright_test.js b/test/helper/Playwright_test.js
index 8f181603b..b2a72ca33 100644
--- a/test/helper/Playwright_test.js
+++ b/test/helper/Playwright_test.js
@@ -335,6 +335,13 @@ describe('Playwright', function () {
       I.switchTo(null);
       I.see('Iframe test');
     });
+
+    it('should switch to iframe using css', async () => {
+      I.amOnPage('/iframe');
+      I.switchTo('iframe#number-frame-1234');
+      I.see('Information');
+      I.see('Lots of valuable data here');
+    });
   });
 
   describe('#seeInSource, #grabSource', () => {

From 9a2e3ba8e6b27b74e6e8dac49ac31681cc9dcfa2 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Sat, 30 Sep 2023 06:36:19 +0200
Subject: [PATCH 02/12] fix: switch to

---
 lib/helper/Playwright.js       | 43 ++++++++++++++--------------------
 test/data/app/controllers.php  | 11 +++++++--
 test/data/app/index.php        |  1 +
 test/data/app/view/iframes.php | 12 ++++++++++
 test/helper/Playwright_test.js |  6 +++++
 5 files changed, 45 insertions(+), 28 deletions(-)
 create mode 100755 test/data/app/view/iframes.php

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index a738b4227..277b44531 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -827,7 +827,7 @@ class Playwright extends Helper {
 
   async _stopBrowser() {
     this.withinLocator = null;
-    this._setPage(null);
+    await this._setPage(null);
     this.context = null;
     popupStore.clear();
     await this.browser.close();
@@ -1882,11 +1882,11 @@ class Playwright extends Helper {
    * @returns {Promise<any>}
    */
   async executeScript(fn, arg) {
-    let context = this.page;
-    if (this.context && this.context.constructor.name === 'Frame') {
-      context = this.context; // switching to iframe context
+    if (this.context && this.context.constructor.name === 'FrameLocator') {
+      // switching to iframe context
+      return this.context.locator(':root').evaluate(fn, arg);
     }
-    return context.evaluate.apply(context, [fn, arg]);
+    return this.page.evaluate.apply(this.page, [fn, arg]);
   }
 
   /**
@@ -2408,7 +2408,7 @@ class Playwright extends Helper {
   }
 
   async _getContext() {
-    if (this.context && this.context.constructor.name === 'Frame') {
+    if (this.context && this.context.constructor.name === 'FrameLocator') {
       return this.context;
     }
     return this.page;
@@ -2535,14 +2535,13 @@ class Playwright extends Helper {
       }
 
       if (locator >= 0 && locator < childFrames.length) {
-        this.context = childFrames[locator];
+        this.context = await this.page.frameLocator('iframe').nth(locator);
         this.contextLocator = locator;
       } else {
         throw new Error('Element #invalidIframeSelector was not found by text|CSS|XPath');
       }
       return;
     }
-    let contentFrame;
 
     if (!locator) {
       this.context = await this.page.frames()[0];
@@ -2551,21 +2550,17 @@ class Playwright extends Helper {
     }
 
     // iframe by selector
-    const els = await this._locate(locator);
-    if (!els[0]) {
-      throw new Error(`Element ${JSON.stringify(locator)} was not found by text|CSS|XPath`);
-    }
+    locator = buildLocatorString(new Locator(locator, 'css'));
+    const frame = await this._locateElement(locator);
 
-    // get content of the first iframe
-    locator = new Locator(locator, 'css');
-    if ((locator.frame && locator.frame === 'iframe') || locator.value.toLowerCase() === 'iframe' || locator.value.toLowerCase().includes('iframe')) {
-      contentFrame = await this.page.frames()[1];
-      // get content of the iframe using its name
-    } else if (locator.value.toLowerCase().includes('name=')) {
-      const frameName = locator.value.split('=')[1].replace(/"/g, '').replaceAll(/]/g, '');
-      contentFrame = await this.page.frame(frameName);
+    if (!frame) {
+      throw new Error(`Frame ${JSON.stringify(locator)} was not found by text|CSS|XPath`);
     }
 
+    this.frame = await this.page.frameLocator(locator);
+
+    const contentFrame = this.frame;
+
     if (contentFrame) {
       this.context = contentFrame;
       this.contextLocator = null;
@@ -3340,13 +3335,9 @@ async function proceedSee(assertType, text, context, strict = false) {
   let allText;
 
   if (!context) {
-    let el = await this.context;
-    if (el && !el.getProperty) {
-      // Fallback to body
-      el = await this.page.$('body');
-    }
+    const el = await this.context;
 
-    allText = [await el.innerText()];
+    allText = [await el.locator('body').innerText()];
     description = 'web application';
   } else {
     const locator = new Locator(context, 'css');
diff --git a/test/data/app/controllers.php b/test/data/app/controllers.php
index 4e2b6e472..2dea9b435 100755
--- a/test/data/app/controllers.php
+++ b/test/data/app/controllers.php
@@ -138,7 +138,7 @@ function GET() {
       include __DIR__ . '/view/image.php';
     }
   }
-  
+
 
 class cookies {
 
@@ -177,6 +177,13 @@ public function GET()
     }
 }
 
+class iframes {
+    public function GET()
+    {
+        include __DIR__.'/view/iframes.php';
+    }
+}
+
 class iframe_nested {
     public function GET()
     {
@@ -311,4 +318,4 @@ class basic_auth {
     function GET() {
         include __DIR__.'/view/basic_auth.php';
     }
-}
\ No newline at end of file
+}
diff --git a/test/data/app/index.php b/test/data/app/index.php
index d963a6fb3..6ab0b28a6 100755
--- a/test/data/app/index.php
+++ b/test/data/app/index.php
@@ -39,6 +39,7 @@
     '/external_url' => 'external_url',
     '/spinner' => 'spinner',
     '/iframe' => 'iframe',
+    '/iframes' => 'iframes',
     '/iframe_nested' => 'iframe_nested',
     '/dynamic' => 'dynamic',
     '/timeout' => 'timeout',
diff --git a/test/data/app/view/iframes.php b/test/data/app/view/iframes.php
new file mode 100755
index 000000000..4d097d939
--- /dev/null
+++ b/test/data/app/view/iframes.php
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+</head>
+<body>
+
+<div class="box"><iframe name="content1" src="https://codecept.io" id="number-frame-5678" width="100%"> </iframe> </div>
+<div class="box"><iframe name="content2" src="info" id="number-frame-1234" width="100%"/></div>
+
+</body>
+</html>
diff --git a/test/helper/Playwright_test.js b/test/helper/Playwright_test.js
index b2a72ca33..42796138a 100644
--- a/test/helper/Playwright_test.js
+++ b/test/helper/Playwright_test.js
@@ -342,6 +342,12 @@ describe('Playwright', function () {
       I.see('Information');
       I.see('Lots of valuable data here');
     });
+
+    it('should switch to iframe using css when there are more than one iframes', () => {
+      I.amOnPage('/iframes');
+      I.switchTo('iframe#number-frame-1234');
+      I.see('Information');
+    });
   });
 
   describe('#seeInSource, #grabSource', () => {

From d067ae7c8e970ecfc0e552ac2981459efa48a220 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Sat, 30 Sep 2023 08:18:28 +0200
Subject: [PATCH 03/12] fix: failed acceptance tests

---
 lib/helper/Playwright.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 277b44531..b321fa20e 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -2481,6 +2481,14 @@ class Playwright extends Helper {
         }, [locator.value, text, $XPath.toString()], { timeout: waitTimeout });
       }
     } else {
+      // we have this as https://github.com/microsoft/playwright/issues/26829 is not yet implemented
+      if (this.frame) {
+        const { setTimeout } = require('timers/promises');
+        await setTimeout(waitTimeout);
+        waiter = await this.frame.locator(`:has-text('${text}')`).first().isVisible();
+        if (!waiter) throw new Error(`Text "${text}" was not found on page after ${waitTimeout / 1000} sec`);
+        return;
+      }
       waiter = contextObject.waitForFunction(text => document.body && document.body.innerText.indexOf(text) > -1, text, { timeout: waitTimeout });
     }
     return waiter.catch((err) => {

From 8004beeb2b8a342a1d5177318e9f3450a89d20f0 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Sat, 30 Sep 2023 09:50:58 +0200
Subject: [PATCH 04/12] fix: within block

---
 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 b321fa20e..c0721ca24 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -846,7 +846,7 @@ class Playwright extends Helper {
     const frame = isFrameLocator(locator);
 
     if (frame) {
-      if (Array.isArray(frame)) {
+      if (Array.isArray(locator.frame)) {
         await this.switchTo(null);
         return frame.reduce((p, frameLocator) => p.then(() => this.switchTo(frameLocator)), Promise.resolve());
       }

From c69dd1c454d4524113984526f24ba0f290905a6d Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Sat, 30 Sep 2023 10:33:21 +0200
Subject: [PATCH 05/12] fix: within tests

---
 lib/helper/Playwright.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index c0721ca24..ef09913d1 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -829,6 +829,7 @@ class Playwright extends Helper {
     this.withinLocator = null;
     await this._setPage(null);
     this.context = null;
+    this.frame = null;
     popupStore.clear();
     await this.browser.close();
   }
@@ -3518,8 +3519,7 @@ async function elementSelected(element) {
 function isFrameLocator(locator) {
   locator = new Locator(locator);
   if (locator.isFrame()) {
-    const _locator = new Locator(locator.value);
-    return _locator.value;
+    return locator.value;
   }
   return false;
 }

From 70cc4d4e38890df810ce1708dbe7855116c7ff60 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Sat, 30 Sep 2023 11:03:54 +0200
Subject: [PATCH 06/12] fix: within tests

---
 lib/helper/Playwright.js       |  2 +-
 package.json                   |  4 ++--
 test/acceptance/within_test.js | 38 +++++++++++++++++-----------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index ef09913d1..1e752d4dd 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -847,7 +847,7 @@ class Playwright extends Helper {
     const frame = isFrameLocator(locator);
 
     if (frame) {
-      if (Array.isArray(locator.frame)) {
+      if (Array.isArray(frame)) {
         await this.switchTo(null);
         return frame.reduce((p, frameLocator) => p.then(() => this.switchTo(frameLocator)), Promise.resolve());
       }
diff --git a/package.json b/package.json
index 9fd6a19fc..b8857f012 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,8 @@
     "lint": "eslint bin/ examples/ lib/ test/ translations/ runok.js",
     "lint-fix": "eslint bin/ examples/ lib/ test/ translations/ runok.js --fix",
     "docs": "./runok.js docs",
-    "test:unit": "mocha test/unit --recursive --timeout 5000",
-    "test:runner": "mocha test/runner --recursive --timeout 5000",
+    "test:unit": "mocha test/unit --recursive --timeout 10000",
+    "test:runner": "mocha test/runner --recursive --timeout 10000",
     "test": "npm run test:unit && npm run test:runner",
     "test:appium-quick": "mocha test/helper/Appium_test.js --grep 'quick'",
     "test:appium-other": "mocha test/helper/Appium_test.js --grep 'second'",
diff --git a/test/acceptance/within_test.js b/test/acceptance/within_test.js
index 9931c984b..726c75253 100644
--- a/test/acceptance/within_test.js
+++ b/test/acceptance/within_test.js
@@ -47,9 +47,9 @@ Scenario('within on iframe without iframe navigation @WebDriverIO @Puppeteer @Pl
 
 Scenario('within on nested iframe without iframe navigation depth 2 @WebDriverIO @Puppeteer @Playwright', ({ I }) => {
   I.amOnPage('/iframe_nested');
-  within({ frame: ['[name=wrapper]', '[name=content]'] }, async () => {
-    await I.fillField('rus', 'Updated');
-    await I.see('Sign in!');
+  within({ frame: ['[name=wrapper]', '[name=content]'] }, () => {
+    I.fillField('rus', 'Updated');
+    I.see('Sign in!');
   });
   I.see('Nested Iframe test');
   I.dontSee('Sign in!');
@@ -57,10 +57,10 @@ Scenario('within on nested iframe without iframe navigation depth 2 @WebDriverIO
 
 Scenario('within on nested iframe depth 1 @WebDriverIO @Puppeteer @Playwright', ({ I }) => {
   I.amOnPage('/iframe');
-  within({ frame: ['[name=content]'] }, async () => {
-    await I.fillField('rus', 'Updated');
-    await I.click('Sign in!');
-    await I.waitForText('Email Address');
+  within({ frame: ['[name=content]'] }, () => {
+    I.fillField('rus', 'Updated');
+    I.click('Sign in!');
+    I.waitForText('Email Address');
   });
   I.see('Iframe test');
   I.dontSee('Email Address');
@@ -68,10 +68,10 @@ Scenario('within on nested iframe depth 1 @WebDriverIO @Puppeteer @Playwright',
 
 Scenario('within on nested iframe depth 2 @WebDriverIO @Puppeteer @Playwright', ({ I }) => {
   I.amOnPage('/iframe_nested');
-  within({ frame: ['[name=wrapper]', '[name=content]'] }, async () => {
-    await I.fillField('rus', 'Updated');
-    await I.click('Sign in!');
-    await I.see('Email Address');
+  within({ frame: ['[name=wrapper]', '[name=content]'] }, () => {
+    I.fillField('rus', 'Updated');
+    I.click('Sign in!');
+    I.see('Email Address');
   });
   I.see('Nested Iframe test');
   I.dontSee('Email Address');
@@ -79,10 +79,10 @@ Scenario('within on nested iframe depth 2 @WebDriverIO @Puppeteer @Playwright',
 
 Scenario('within on nested iframe depth 2 and mixed id and xpath selector @WebDriverIO @Puppeteer @Playwright', ({ I }) => {
   I.amOnPage('/iframe_nested');
-  within({ frame: ['#wrapperId', '[name=content]'] }, async () => {
-    await I.fillField('rus', 'Updated');
-    await I.click('Sign in!');
-    await I.see('Email Address');
+  within({ frame: ['#wrapperId', '[name=content]'] }, () => {
+    I.fillField('rus', 'Updated');
+    I.click('Sign in!');
+    I.see('Email Address');
   });
   I.see('Nested Iframe test');
   I.dontSee('Email Address');
@@ -90,10 +90,10 @@ Scenario('within on nested iframe depth 2 and mixed id and xpath selector @WebDr
 
 Scenario('within on nested iframe depth 2 and mixed class and xpath selector @WebDriverIO @Puppeteer @Playwright', ({ I }) => {
   I.amOnPage('/iframe_nested');
-  within({ frame: ['.wrapperClass', '[name=content]'] }, async () => {
-    await I.fillField('rus', 'Updated');
-    await I.click('Sign in!');
-    await I.see('Email Address');
+  within({ frame: ['.wrapperClass', '[name=content]'] }, () => {
+    I.fillField('rus', 'Updated');
+    I.click('Sign in!');
+    I.see('Email Address');
   });
   I.see('Nested Iframe test');
   I.dontSee('Email Address');

From 8b1ad761720028587bc5cf6acee8dc643ab0e134 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Sat, 30 Sep 2023 11:12:31 +0200
Subject: [PATCH 07/12] fix: within tests

---
 .github/workflows/playwright.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 96d8fa5c3..c309f8978 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -37,7 +37,7 @@ jobs:
       env:
         PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
     - name: Install deps
-      run: npm install playwright@1.32.3 & npx playwright install-deps
+      run: npm install playwright@1.35.1 & npx playwright install-deps
     - name: start a server
       run: "php -S 127.0.0.1:8000 -t test/data/app &"
     - name: run chromium tests

From 4bd0ed9327550560c1dd383e3014f89122ced4ee Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Wed, 4 Oct 2023 16:06:29 +0200
Subject: [PATCH 08/12] fix: within block

---
 lib/helper/Playwright.js | 13 +++++++++++--
 test/helper/webapi.js    | 28 ++++++++++++++--------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 1e752d4dd..da49cf80c 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -4,6 +4,7 @@ const fs = require('fs');
 const Helper = require('@codeceptjs/helper');
 const { v4: uuidv4 } = require('uuid');
 const assert = require('assert');
+const { setTimeout } = require('timers/promises');
 const Locator = require('../locator');
 const store = require('../store');
 const recorder = require('../recorder');
@@ -868,6 +869,7 @@ class Playwright extends Helper {
     this.withinLocator = null;
     this.context = await this.page;
     this.contextLocator = null;
+    this.frame = null;
   }
 
   _extractDataFromPerformanceTiming(timing, ...dataNames) {
@@ -1157,6 +1159,9 @@ class Playwright extends Helper {
    */
   async _locate(locator) {
     const context = await this.context || await this._getContext();
+
+    if (this.frame) return findElements(this.frame, locator);
+
     return findElements(context, locator);
   }
 
@@ -2566,7 +2571,11 @@ class Playwright extends Helper {
       throw new Error(`Frame ${JSON.stringify(locator)} was not found by text|CSS|XPath`);
     }
 
-    this.frame = await this.page.frameLocator(locator);
+    if (this.frame) {
+      this.frame = await this.frame.frameLocator(locator);
+    } else {
+      this.frame = await this.page.frameLocator(locator);
+    }
 
     const contentFrame = this.frame;
 
@@ -3344,7 +3353,7 @@ async function proceedSee(assertType, text, context, strict = false) {
   let allText;
 
   if (!context) {
-    const el = await this.context;
+    const el = this.frame ? await this.frame : await this.context;
 
     allText = [await el.locator('body').innerText()];
     description = 'web application';
diff --git a/test/helper/webapi.js b/test/helper/webapi.js
index c55e11637..918056828 100644
--- a/test/helper/webapi.js
+++ b/test/helper/webapi.js
@@ -1173,58 +1173,58 @@ module.exports.tests = function () {
         .then(() => I.see('Toggle navigation', '.container fieldset'));
     });
 
-    it('within should respect context in see when using nested frames', async function () {
+    it('within should respect context in see when using nested frames', function () {
       if (isHelper('TestCafe')) this.skip();
 
-      await I.amOnPage('/iframe_nested');
-      await I._withinBegin({
+      I.amOnPage('/iframe_nested');
+      I._withinBegin({
         frame: ['#wrapperId', '[name=content]'],
       });
 
       try {
-        await I.see('Kill & Destroy');
+        I.see('Kill & Destroy');
       } catch (err) {
         if (!err) assert.fail('seen "Kill & Destroy"');
       }
 
       try {
-        await I.dontSee('Nested Iframe test');
+        I.dontSee('Nested Iframe test');
       } catch (err) {
         if (!err) assert.fail('seen "Nested Iframe test"');
       }
 
       try {
-        await I.dontSee('Iframe test');
+        I.dontSee('Iframe test');
       } catch (err) {
         if (!err) assert.fail('seen "Iframe test"');
       }
     });
 
-    it('within should respect context in see when using frame', async function () {
+    it('within should respect context in see when using frame', function () {
       if (isHelper('TestCafe')) this.skip();
 
-      await I.amOnPage('/iframe');
-      await I._withinBegin({
+      I.amOnPage('/iframe');
+      I._withinBegin({
         frame: '#number-frame-1234',
       });
 
       try {
-        await I.see('Information');
+        I.see('Information');
       } catch (err) {
         if (!err) assert.fail('seen "Information"');
       }
     });
 
-    it('within should respect context in see when using frame with strict locator', async function () {
+    it('within should respect context in see when using frame with strict locator', function () {
       if (isHelper('TestCafe')) this.skip();
 
-      await I.amOnPage('/iframe');
-      await I._withinBegin({
+      I.amOnPage('/iframe');
+      I._withinBegin({
         frame: { css: '#number-frame-1234' },
       });
 
       try {
-        await I.see('Information');
+        I.see('Information');
       } catch (err) {
         if (!err) assert.fail('seen "Information"');
       }

From 81e4fbe6b7aed8b925a3fc2fa619e9b76be27102 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Wed, 4 Oct 2023 16:27:09 +0200
Subject: [PATCH 09/12] fix within block

---
 lib/helper/Playwright.js       |  1 -
 test/helper/Playwright_test.js |  2 +-
 test/helper/webapi.js          | 12 ++++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index da49cf80c..5bf9c2a0b 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -4,7 +4,6 @@ const fs = require('fs');
 const Helper = require('@codeceptjs/helper');
 const { v4: uuidv4 } = require('uuid');
 const assert = require('assert');
-const { setTimeout } = require('timers/promises');
 const Locator = require('../locator');
 const store = require('../store');
 const recorder = require('../recorder');
diff --git a/test/helper/Playwright_test.js b/test/helper/Playwright_test.js
index 42796138a..c3133399d 100644
--- a/test/helper/Playwright_test.js
+++ b/test/helper/Playwright_test.js
@@ -336,7 +336,7 @@ describe('Playwright', function () {
       I.see('Iframe test');
     });
 
-    it('should switch to iframe using css', async () => {
+    it('should switch to iframe using css', () => {
       I.amOnPage('/iframe');
       I.switchTo('iframe#number-frame-1234');
       I.see('Information');
diff --git a/test/helper/webapi.js b/test/helper/webapi.js
index 918056828..9a28eab1b 100644
--- a/test/helper/webapi.js
+++ b/test/helper/webapi.js
@@ -1173,28 +1173,28 @@ module.exports.tests = function () {
         .then(() => I.see('Toggle navigation', '.container fieldset'));
     });
 
-    it('within should respect context in see when using nested frames', function () {
+    it('within should respect context in see when using nested frames', async function () {
       if (isHelper('TestCafe')) this.skip();
 
-      I.amOnPage('/iframe_nested');
-      I._withinBegin({
+      await I.amOnPage('/iframe_nested');
+      await I._withinBegin({
         frame: ['#wrapperId', '[name=content]'],
       });
 
       try {
-        I.see('Kill & Destroy');
+        await I.see('Kill & Destroy');
       } catch (err) {
         if (!err) assert.fail('seen "Kill & Destroy"');
       }
 
       try {
-        I.dontSee('Nested Iframe test');
+        await I.dontSee('Nested Iframe test');
       } catch (err) {
         if (!err) assert.fail('seen "Nested Iframe test"');
       }
 
       try {
-        I.dontSee('Iframe test');
+        await I.dontSee('Iframe test');
       } catch (err) {
         if (!err) assert.fail('seen "Iframe test"');
       }

From e9f45a1e8e199ecb43f319558a7c148e6c941706 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Wed, 4 Oct 2023 16:41:51 +0200
Subject: [PATCH 10/12] fix switchTo

---
 lib/helper/Playwright.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 5bf9c2a0b..1cb7df22c 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -2557,7 +2557,7 @@ class Playwright extends Helper {
     }
 
     if (!locator) {
-      this.context = await this.page.frames()[0];
+      this.context = this.page;
       this.contextLocator = null;
       return;
     }
@@ -3352,7 +3352,7 @@ async function proceedSee(assertType, text, context, strict = false) {
   let allText;
 
   if (!context) {
-    const el = this.frame ? await this.frame : await this.context;
+    const el = await this.context;
 
     allText = [await el.locator('body').innerText()];
     description = 'web application';

From 7fa87cae5d62746260ca738491f215884388a706 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Wed, 4 Oct 2023 16:56:27 +0200
Subject: [PATCH 11/12] fix: puppeteer test

---
 test/helper/webapi.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/helper/webapi.js b/test/helper/webapi.js
index 9a28eab1b..c55e11637 100644
--- a/test/helper/webapi.js
+++ b/test/helper/webapi.js
@@ -1200,31 +1200,31 @@ module.exports.tests = function () {
       }
     });
 
-    it('within should respect context in see when using frame', function () {
+    it('within should respect context in see when using frame', async function () {
       if (isHelper('TestCafe')) this.skip();
 
-      I.amOnPage('/iframe');
-      I._withinBegin({
+      await I.amOnPage('/iframe');
+      await I._withinBegin({
         frame: '#number-frame-1234',
       });
 
       try {
-        I.see('Information');
+        await I.see('Information');
       } catch (err) {
         if (!err) assert.fail('seen "Information"');
       }
     });
 
-    it('within should respect context in see when using frame with strict locator', function () {
+    it('within should respect context in see when using frame with strict locator', async function () {
       if (isHelper('TestCafe')) this.skip();
 
-      I.amOnPage('/iframe');
-      I._withinBegin({
+      await I.amOnPage('/iframe');
+      await I._withinBegin({
         frame: { css: '#number-frame-1234' },
       });
 
       try {
-        I.see('Information');
+        await I.see('Information');
       } catch (err) {
         if (!err) assert.fail('seen "Information"');
       }

From 5af37df7662e8d054f21ce905d646477bc648c8d Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Wed, 4 Oct 2023 17:39:53 +0200
Subject: [PATCH 12/12] fix: switchTo

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

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 1cb7df22c..9338fddc2 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -2559,6 +2559,7 @@ class Playwright extends Helper {
     if (!locator) {
       this.context = this.page;
       this.contextLocator = null;
+      this.frame = null;
       return;
     }