From 91bb118bf9a49655ca389f8b970683faa3de95a8 Mon Sep 17 00:00:00 2001
From: Reuben Miller <reuben.d.miller@gmail.com>
Date: Tue, 24 Oct 2017 23:23:25 +0200
Subject: [PATCH 1/7] [WebDriverIO] Added support for nested iframes in the
 within block

---
 docs/acceptance.md                   |  2 +-
 lib/helper/WebDriverIO.js            |  6 +++++
 test/acceptance/within_test.js       | 33 ++++++++++++++++++++++++++++
 test/data/app/controllers.php        |  7 ++++++
 test/data/app/index.php              |  1 +
 test/data/app/view/iframe_nested.php | 13 +++++++++++
 6 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 test/data/app/view/iframe_nested.php

diff --git a/docs/acceptance.md b/docs/acceptance.md
index 33d44b2f7..71f49e5bf 100644
--- a/docs/acceptance.md
+++ b/docs/acceptance.md
@@ -246,7 +246,7 @@ within({frame: "#editor"}, () => {
 });
 ```
 
-Nested IFrames can be set by passing array *(Nightmare only)*:
+Nested IFrames can be set by passing array *(WebDriverIO & Nightmare only)*:
 
 ```js
 within({frame: [".content", "#editor"]);
diff --git a/lib/helper/WebDriverIO.js b/lib/helper/WebDriverIO.js
index a92796d76..43d06b9aa 100644
--- a/lib/helper/WebDriverIO.js
+++ b/lib/helper/WebDriverIO.js
@@ -379,6 +379,12 @@ class WebDriverIO extends Helper {
     let frame = isFrameLocator(locator);
     let client = this.browser;
     if (frame) {
+      if (Array.isArray(frame)) {
+        withinStore.frame = frame.join('>');
+        return client
+          .frame(null)
+          .then(() => frame.reduce((p, frameLocator) => p.then(() => this.switchTo(frameLocator)), Promise.resolve()));
+      }
       withinStore.frame = frame;
       return this.switchTo(frame);
     }
diff --git a/test/acceptance/within_test.js b/test/acceptance/within_test.js
index 1f372ff75..bc267dbf4 100644
--- a/test/acceptance/within_test.js
+++ b/test/acceptance/within_test.js
@@ -31,4 +31,37 @@ Scenario('within on nested iframe @nightmare', (I) => {
   });
   I.see('Iframe test');
   I.dontSee('Email Address');
+});
+
+Scenario('within on nested iframe with a depth of 2 @WebDriverIO', (I) => {
+  I.amOnPage('/iframe_nested');
+  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');
+});
+
+Scenario('within on nested iframe with a depth of 2 using ids @WebDriverIO', (I) => {
+  I.amOnPage('/iframe_nested');
+  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');
+});
+
+Scenario('within on nested iframe with a depth of 2 using class @WebDriverIO', (I) => {
+  I.amOnPage('/iframe_nested');
+  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');
 });
\ No newline at end of file
diff --git a/test/data/app/controllers.php b/test/data/app/controllers.php
index f64d559a7..e22396679 100755
--- a/test/data/app/controllers.php
+++ b/test/data/app/controllers.php
@@ -154,6 +154,13 @@ public function GET()
     }
 }
 
+class iframe_nested {
+    public function GET()
+    {
+        include __DIR__.'/view/iframe_nested.php';
+    }
+}
+
 class facebookController {
     function GET($matches) {
         include __DIR__.'/view/facebook.php';
diff --git a/test/data/app/index.php b/test/data/app/index.php
index b24e41737..c04b259e9 100755
--- a/test/data/app/index.php
+++ b/test/data/app/index.php
@@ -38,6 +38,7 @@
     '/external_url' => 'external_url',
     '/spinner' => 'spinner',
     '/iframe' => 'iframe',
+    '/iframe_nested' => 'iframe_nested',
     '/dynamic' => 'dynamic',
     '/timeout' => 'timeout',
 );
diff --git a/test/data/app/view/iframe_nested.php b/test/data/app/view/iframe_nested.php
new file mode 100644
index 000000000..2aac4a7d9
--- /dev/null
+++ b/test/data/app/view/iframe_nested.php
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+</head>
+<body>
+
+<h1>Nested Iframe test</h1>
+
+<iframe id="wrapperId" name="wrapper" class="wrapperClass" src="iframe" style="width: 400px; height: 400px"/>
+
+</body>
+</html>
\ No newline at end of file

From 3a3f3ff8205bc21e3a44a30504a436597f795e79 Mon Sep 17 00:00:00 2001
From: Reuben Miller <reuben.d.miller@gmail.com>
Date: Tue, 24 Oct 2017 23:31:47 +0200
Subject: [PATCH 2/7] Added the @nightmare tags to the extended nested iframe
 tests

---
 test/acceptance/within_test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/acceptance/within_test.js b/test/acceptance/within_test.js
index bc267dbf4..a33318dfe 100644
--- a/test/acceptance/within_test.js
+++ b/test/acceptance/within_test.js
@@ -22,7 +22,7 @@ Scenario('within on iframe @WebDriverIO @Nightmare', (I) => {
   I.dontSee('Email Address');
 });
 
-Scenario('within on nested iframe @nightmare', (I) => {
+Scenario('within on nested iframe @WebDriverIO @nightmare', (I) => {
   I.amOnPage('/iframe');
   within({frame: ['[name=content]']}, () => {
     I.fillField('rus', 'Updated');
@@ -33,7 +33,7 @@ Scenario('within on nested iframe @nightmare', (I) => {
   I.dontSee('Email Address');
 });
 
-Scenario('within on nested iframe with a depth of 2 @WebDriverIO', (I) => {
+Scenario('within on nested iframe with a depth of 2 @WebDriverIO @nightmare', (I) => {
   I.amOnPage('/iframe_nested');
   within({frame: ['[name=wrapper]', '[name=content]']}, () => {
     I.fillField('rus', 'Updated');
@@ -44,7 +44,7 @@ Scenario('within on nested iframe with a depth of 2 @WebDriverIO', (I) => {
   I.dontSee('Email Address');
 });
 
-Scenario('within on nested iframe with a depth of 2 using ids @WebDriverIO', (I) => {
+Scenario('within on nested iframe with a depth of 2 using ids @WebDriverIO @nightmare', (I) => {
   I.amOnPage('/iframe_nested');
   within({frame: ['#wrapperId', '[name=content]']}, () => {
     I.fillField('rus', 'Updated');
@@ -55,7 +55,7 @@ Scenario('within on nested iframe with a depth of 2 using ids @WebDriverIO', (I)
   I.dontSee('Email Address');
 });
 
-Scenario('within on nested iframe with a depth of 2 using class @WebDriverIO', (I) => {
+Scenario('within on nested iframe with a depth of 2 using class @WebDriverIO @nightmare', (I) => {
   I.amOnPage('/iframe_nested');
   within({frame: ['.wrapperClass', '[name=content]']}, () => {
     I.fillField('rus', 'Updated');

From 89f01c7bef02d7fe841c05bdb20ed0f23caf95c8 Mon Sep 17 00:00:00 2001
From: Reuben Miller <reuben.d.miller@gmail.com>
Date: Wed, 25 Oct 2017 17:15:58 +0200
Subject: [PATCH 3/7] Modified default window size because the a few tab tests
 were failing because the clickable element was not visible.

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

diff --git a/test/helper/WebDriverIO_test.js b/test/helper/WebDriverIO_test.js
index 7744c6980..549910278 100644
--- a/test/helper/WebDriverIO_test.js
+++ b/test/helper/WebDriverIO_test.js
@@ -28,7 +28,7 @@ describe('WebDriverIO', function () {
     wd = new WebDriverIO({
       url: site_url,
       browser: 'chrome',
-      windowSize: '500x400',
+      windowSize: '500x700',
       smartWait: 10 // just to try
     });
   });

From 3806e79d20b4e1b822d05796461b41a7e79ae2c3 Mon Sep 17 00:00:00 2001
From: Reuben Miller <reuben.d.miller@gmail.com>
Date: Wed, 25 Oct 2017 18:21:39 +0200
Subject: [PATCH 4/7] Added acceptance tests for the within feature for both
 WebDriverIO and Nightmare

---
 test/acceptance/within_test.js       | 30 +++++++++++++++++++++++-----
 test/data/app/view/iframe_nested.php |  2 +-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/test/acceptance/within_test.js b/test/acceptance/within_test.js
index a33318dfe..4ad2e27a4 100644
--- a/test/acceptance/within_test.js
+++ b/test/acceptance/within_test.js
@@ -11,7 +11,7 @@ Scenario('within on form @WebDriverIO @protractor @nightmare', (I) => {
   I.dontSeeCheckboxIsChecked({css: "form[name=form1] input[name=first_test_radio]"});
 });
 
-Scenario('within on iframe @WebDriverIO @Nightmare', (I) => {
+Scenario('within on iframe @WebDriverIO', (I) => {
   I.amOnPage('/iframe');
   within({frame: 'iframe'}, () => {
     I.fillField('rus', 'Updated');
@@ -22,7 +22,27 @@ Scenario('within on iframe @WebDriverIO @Nightmare', (I) => {
   I.dontSee('Email Address');
 });
 
-Scenario('within on nested iframe @WebDriverIO @nightmare', (I) => {
+Scenario('within on iframe (without iframe navigation) @WebDriverIO @nightmare', (I) => {
+  I.amOnPage('/iframe');
+  within({frame: 'iframe'}, () => {
+    I.fillField('rus', 'Updated');
+    I.see('Sign in!');
+  });
+  I.see('Iframe test');
+  I.dontSee('Sign in!');
+});
+
+Scenario('within on nested iframe (without iframe navigation) (depth=2) @WebDriverIO @nightmare', (I) => {
+  I.amOnPage('/iframe_nested');
+  within({frame: ['[name=wrapper]', '[name=content]']}, () => {
+    I.fillField('rus', 'Updated');
+    I.see('Sign in!');
+  });
+  I.see('Nested Iframe test');
+  I.dontSee('Sign in!');
+});
+
+Scenario('within on nested iframe (depth=1) @WebDriverIO', (I) => {
   I.amOnPage('/iframe');
   within({frame: ['[name=content]']}, () => {
     I.fillField('rus', 'Updated');
@@ -33,7 +53,7 @@ Scenario('within on nested iframe @WebDriverIO @nightmare', (I) => {
   I.dontSee('Email Address');
 });
 
-Scenario('within on nested iframe with a depth of 2 @WebDriverIO @nightmare', (I) => {
+Scenario('within on nested iframe (depth=2) @WebDriverIO', (I) => {
   I.amOnPage('/iframe_nested');
   within({frame: ['[name=wrapper]', '[name=content]']}, () => {
     I.fillField('rus', 'Updated');
@@ -44,7 +64,7 @@ Scenario('within on nested iframe with a depth of 2 @WebDriverIO @nightmare', (I
   I.dontSee('Email Address');
 });
 
-Scenario('within on nested iframe with a depth of 2 using ids @WebDriverIO @nightmare', (I) => {
+Scenario('within on nested iframe (depth=2) and mixed id and xpath selector @WebDriverIO', (I) => {
   I.amOnPage('/iframe_nested');
   within({frame: ['#wrapperId', '[name=content]']}, () => {
     I.fillField('rus', 'Updated');
@@ -55,7 +75,7 @@ Scenario('within on nested iframe with a depth of 2 using ids @WebDriverIO @nigh
   I.dontSee('Email Address');
 });
 
-Scenario('within on nested iframe with a depth of 2 using class @WebDriverIO @nightmare', (I) => {
+Scenario('within on nested iframe (depth=2) and mixed class and xpath selector @WebDriverIO', (I) => {
   I.amOnPage('/iframe_nested');
   within({frame: ['.wrapperClass', '[name=content]']}, () => {
     I.fillField('rus', 'Updated');
diff --git a/test/data/app/view/iframe_nested.php b/test/data/app/view/iframe_nested.php
index 2aac4a7d9..49b2c4f82 100644
--- a/test/data/app/view/iframe_nested.php
+++ b/test/data/app/view/iframe_nested.php
@@ -7,7 +7,7 @@
 
 <h1>Nested Iframe test</h1>
 
-<iframe id="wrapperId" name="wrapper" class="wrapperClass" src="iframe" style="width: 400px; height: 400px"/>
+<iframe id="wrapperId" name="wrapper" class="wrapperClass" src="iframe" style="width: 600px; height: 600px"/>
 
 </body>
 </html>
\ No newline at end of file

From 127ef711a52037ec37b95dc81c6f5861544c9af6 Mon Sep 17 00:00:00 2001
From: Reuben Miller <reuben.d.miller@gmail.com>
Date: Wed, 25 Oct 2017 20:24:34 +0200
Subject: [PATCH 5/7] Updated expected window height in webapi tests due to
 changing it in a previous commit

---
 test/helper/webapi.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/test/helper/webapi.js b/test/helper/webapi.js
index 60467f3da..1c3e1a16f 100644
--- a/test/helper/webapi.js
+++ b/test/helper/webapi.js
@@ -476,7 +476,7 @@ module.exports.tests = function() {
     it('should set initial window size', () => {
       return I.amOnPage('/form/resize')
         .then(() => I.click('Window Size'))
-        .then(() => I.see('Height 400', '#height'))
+        .then(() => I.see('Height 700', '#height'))
         .then(() => I.see('Width 500', '#width'));
     });
 
@@ -678,6 +678,23 @@ module.exports.tests = function() {
           if (!err) assert.fail('seen fieldset');
         });
     });
+
+    it('within should respect context in see when using nested frames', () => {
+      return I.amOnPage('/iframe_nested')
+        .then(() => I._withinBegin({frame: ['#wrapperId', '[name=content]']}))
+        .then(() => I.see('Kill & Destroy'))
+        .catch((err) => {
+          if (!err) assert.fail('seen "Kill & Destroy"');
+        })
+        .then(() => I.dontSee('Nested Iframe test'))
+        .catch((err) => {
+          if (!err) assert.fail('seen "Nested Iframe test"');
+        })
+        .then(() => I.dontSee('Iframe test'))
+        .catch((err) => {
+          if (!err) assert.fail('seen "Iframe test"');
+        });
+    });
   });
 
 };

From 80c193d12fcfb43aed4902e9bc6159ebd61f49cf Mon Sep 17 00:00:00 2001
From: Reuben Miller <reuben.d.miller@gmail.com>
Date: Wed, 25 Oct 2017 21:27:33 +0200
Subject: [PATCH 6/7] Fixed initial window size in the SeleniumWebdriver and
 Nightmare Helpers so it matches with the tests now

---
 test/helper/Nightmare_test.js         | 2 +-
 test/helper/SeleniumWebdriver_test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/helper/Nightmare_test.js b/test/helper/Nightmare_test.js
index c7e5dc38a..3bd376db9 100644
--- a/test/helper/Nightmare_test.js
+++ b/test/helper/Nightmare_test.js
@@ -25,7 +25,7 @@ describe('Nightmare', function () {
 
     I = new Nightmare({
       url: site_url,
-      windowSize: '500x400',
+      windowSize: '500x700',
       show: false
     });
     I._init();
diff --git a/test/helper/SeleniumWebdriver_test.js b/test/helper/SeleniumWebdriver_test.js
index 35c273eaa..555b07645 100644
--- a/test/helper/SeleniumWebdriver_test.js
+++ b/test/helper/SeleniumWebdriver_test.js
@@ -26,7 +26,7 @@ describe('SeleniumWebdriver', function () {
     I = new SeleniumWebdriver({
       url: site_url,
       browser: 'chrome',
-      windowSize: '500x400',
+      windowSize: '500x700',
       restart: false
 
     });

From 38c16ce15bd22c56c6e2f7f7a5420f1540dd116a Mon Sep 17 00:00:00 2001
From: Reuben Miller <reuben.d.miller@gmail.com>
Date: Wed, 25 Oct 2017 22:12:41 +0200
Subject: [PATCH 7/7] Change the example with nested iframes in the docs so it
 shows the full use of within for the sake of consistency

---
 docs/acceptance.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/acceptance.md b/docs/acceptance.md
index 71f49e5bf..57e7a4309 100644
--- a/docs/acceptance.md
+++ b/docs/acceptance.md
@@ -249,7 +249,9 @@ within({frame: "#editor"}, () => {
 Nested IFrames can be set by passing array *(WebDriverIO & Nightmare only)*:
 
 ```js
-within({frame: [".content", "#editor"]);
+within({frame: [".content", "#editor"]}, () => {
+  I.see('Page');
+});
 ```
 
 ---