Add switch to parent frame command

Part of #683

Author: andrewnicols

lib/Remote/HttpCommandExecutor.php

@@ -51,6 +51,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::FIND_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element'],
         DriverCommand::FIND_ELEMENTS => ['method' => 'POST', 'url' => '/session/:sessionId/elements'],
         DriverCommand::SWITCH_TO_FRAME => ['method' => 'POST', 'url' => '/session/:sessionId/frame'],
+        DriverCommand::SWITCH_TO_PARENT_FRAME => ['method' => 'POST', 'url' => '/session/:sessionId/frame/parent'],
         DriverCommand::SWITCH_TO_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window'],
         DriverCommand::GET => ['method' => 'POST', 'url' => '/session/:sessionId/url'],
         DriverCommand::GET_ACTIVE_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/active'],

lib/Remote/RemoteTargetLocator.php

@@ -97,6 +97,18 @@ public function frame($frame)
         return $this->driver;
     }
 
+    /**
+     * Switch to the parent iframe.
+     *
+     * @return WebDriver The driver focused on the given frame.
+     */
+    public function parent()
+    {
+        $this->executor->execute(DriverCommand::SWITCH_TO_PARENT_FRAME, []);
+
+        return $this->driver;
+    }
+
     /**
      * Switch the focus to another window by its handle.
      *

lib/WebDriverTargetLocator.php

@@ -37,6 +37,14 @@ public function defaultContent();
      */
     public function frame($frame);
 
+    ///**
+    // * Switch to the parent iframe.
+    // *
+    // * @todo Add in next major release (BC)
+    // * @return WebDriver The driver focused on the given frame.
+    // */
+    //public function parent();
+
     /**
      * Switch the focus to another window by its handle.
      *

tests/functional/RemoteTargetLocatorTest.php

@@ -92,6 +92,22 @@ public function testShouldSwitchToFrameByItsId()
         $this->assertContains($parentPage, $this->driver->getPageSource());
     }
 
+    public function testShouldSwitchToParentFrame()
+    {
+        $parentPage = 'This is the host page which contains an iFrame';
+        $firstChildFrame = 'This is the content of the iFrame';
+
+        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+
+        $this->assertContains($parentPage, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->frame(0);
+        $this->assertContains($firstChildFrame, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->parent();
+        $this->assertContains($parentPage, $this->driver->getPageSource());
+    }
+
     public function testShouldSwitchToFrameByElement()
     {
         $this->driver->get($this->getTestPageUrl('page_with_frame.html'));