From 566624f5b555a8424f45e79a4ca0a86e47925d72 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Sat, 2 Sep 2023 08:43:15 +0200
Subject: [PATCH 1/4] fix: switchTo throws error when passing css locator

---
 lib/helper/Playwright.js      | 7 ++++---
 test/data/app/view/iframe.php | 4 ++--
 test/helper/webapi.js         | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index b1c8d032e..9c825817a 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -2554,11 +2554,12 @@ class Playwright extends Helper {
     // assertElementExists(els, locator);
 
     // get content of the first iframe
-    if ((locator.frame && locator.frame === 'iframe') || locator.toLowerCase() === 'iframe') {
+    locator = new Locator(locator, 'css');
+    if ((locator.frame && locator.frame === 'iframe') || locator.value.toLowerCase() === 'iframe') {
       contentFrame = await this.page.frames()[1];
       // get content of the iframe using its name
-    } else if (locator.toLowerCase().includes('name=')) {
-      const frameName = locator.split('=')[1].replace(/"/g, '').replaceAll(/]/g, '');
+    } else if (locator.value.toLowerCase().includes('name=')) {
+      const frameName = locator.value.split('=')[1].replace(/"/g, '').replaceAll(/]/g, '');
       contentFrame = await this.page.frame(frameName);
     }
 
diff --git a/test/data/app/view/iframe.php b/test/data/app/view/iframe.php
index 2004c6035..1c2361558 100755
--- a/test/data/app/view/iframe.php
+++ b/test/data/app/view/iframe.php
@@ -7,7 +7,7 @@
 
 <h1>Iframe test</h1>
 
-<iframe name="content" src="info" />
+<iframe name="content" src="info" id="number-frame-1234"/>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/helper/webapi.js b/test/helper/webapi.js
index 3e9959cec..885d4a151 100644
--- a/test/helper/webapi.js
+++ b/test/helper/webapi.js
@@ -455,7 +455,7 @@ module.exports.tests = function () {
       if (isHelper('TestCafe')) this.skip(); // TODO Not yet implemented
 
       await I.amOnPage('/iframe');
-      await I.switchTo('iframe');
+      await I.switchTo({ css: 'iframe' });
       const val = await I.executeScript(() => document.getElementsByTagName('h1')[0].innerText);
       assert.equal(val, 'Information');
     });

From fc488c67f109ba14c92c5c8ff5ff762367f80afe Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Sat, 2 Sep 2023 12:37:36 +0200
Subject: [PATCH 2/4] fix: switchTo

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

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 9c825817a..448b9ab95 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -2551,7 +2551,9 @@ class Playwright extends Helper {
 
     // iframe by selector
     const els = await this._locate(locator);
-    // assertElementExists(els, locator);
+    if (!els[0]) {
+      throw new Error(`Element ${JSON.stringify(locator)} was not found by text|CSS|XPath`);
+    }
 
     // get content of the first iframe
     locator = new Locator(locator, 'css');
@@ -2567,7 +2569,7 @@ class Playwright extends Helper {
       this.context = contentFrame;
       this.contextLocator = null;
     } else {
-      this.context = els[0];
+      this.context = this.page.frame(this.page.frames()[1].name());
       this.contextLocator = locator;
     }
   }

From cc580867fd140f3fad47e50e01a04ab9f32f1f54 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Fri, 8 Sep 2023 07:24:50 +0200
Subject: [PATCH 3/4] fix: improvements for within

---
 lib/helper/Playwright.js |  9 ++++++---
 test/helper/webapi.js    | 30 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 448b9ab95..d06c8edd2 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -849,8 +849,8 @@ class Playwright extends Helper {
         await this.switchTo(null);
         return frame.reduce((p, frameLocator) => p.then(() => this.switchTo(frameLocator)), Promise.resolve());
       }
-      await this.switchTo(locator);
-      this.withinLocator = new Locator(locator);
+      await this.switchTo(frame);
+      this.withinLocator = new Locator(frame);
       return;
     }
 
@@ -3517,7 +3517,10 @@ async function elementSelected(element) {
 
 function isFrameLocator(locator) {
   locator = new Locator(locator);
-  if (locator.isFrame()) return locator.value;
+  if (locator.isFrame()) {
+    const _locator = new Locator(locator.value);
+    return _locator.value;
+  }
   return false;
 }
 
diff --git a/test/helper/webapi.js b/test/helper/webapi.js
index 885d4a151..447b716ec 100644
--- a/test/helper/webapi.js
+++ b/test/helper/webapi.js
@@ -1195,6 +1195,36 @@ module.exports.tests = function () {
         if (!err) assert.fail('seen "Iframe test"');
       }
     });
+
+    it('within should respect context in see when using frame', async function () {
+      if (isHelper('TestCafe')) this.skip();
+
+      await I.amOnPage('/iframe');
+      await I._withinBegin({
+        frame: '#number-frame-1234',
+      });
+
+      try {
+        await I.see('Information');
+      } catch (err) {
+        if (!err) assert.fail('seen "Information"');
+      }
+    });
+
+    it('within should respect context in see when using frame with css locator', async function () {
+      if (isHelper('TestCafe')) this.skip();
+
+      await I.amOnPage('/iframe');
+      await I._withinBegin({
+        frame: { css: '#number-frame-1234' },
+      });
+
+      try {
+        await I.see('Information');
+      } catch (err) {
+        if (!err) assert.fail('seen "Information"');
+      }
+    });
   });
 
   describe('scroll: #scrollTo, #scrollPageToTop, #scrollPageToBottom', () => {

From e2f40ec3490018cad5480b805e4c6868369a2699 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Fri, 8 Sep 2023 08:04:04 +0200
Subject: [PATCH 4/4] fix: puppeteer within issue

---
 lib/helper/Puppeteer.js | 9 ++++++---
 test/helper/webapi.js   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/helper/Puppeteer.js b/lib/helper/Puppeteer.js
index 47c6b5629..62f0e2f1c 100644
--- a/lib/helper/Puppeteer.js
+++ b/lib/helper/Puppeteer.js
@@ -604,8 +604,8 @@ class Puppeteer extends Helper {
         return this.switchTo(null)
           .then(() => frame.reduce((p, frameLocator) => p.then(() => this.switchTo(frameLocator)), Promise.resolve()));
       }
-      await this.switchTo(locator);
-      this.withinLocator = new Locator(locator);
+      await this.switchTo(frame);
+      this.withinLocator = new Locator(frame);
       return;
     }
 
@@ -2602,7 +2602,10 @@ async function elementSelected(element) {
 
 function isFrameLocator(locator) {
   locator = new Locator(locator);
-  if (locator.isFrame()) return locator.value;
+  if (locator.isFrame()) {
+    const _locator = new Locator(locator);
+    return _locator.value;
+  }
   return false;
 }
 
diff --git a/test/helper/webapi.js b/test/helper/webapi.js
index 447b716ec..a6f2f026e 100644
--- a/test/helper/webapi.js
+++ b/test/helper/webapi.js
@@ -1211,7 +1211,7 @@ module.exports.tests = function () {
       }
     });
 
-    it('within should respect context in see when using frame with css locator', async function () {
+    it('within should respect context in see when using frame with strict locator', async function () {
       if (isHelper('TestCafe')) this.skip();
 
       await I.amOnPage('/iframe');