Merge pull request Element-34#26 from bernardpeh/master

Allowed switch_to_frame() to switch back to parent html

Author: adamgoucher

PHPWebDriver/WebDriverSession.php

@@ -196,6 +196,8 @@ public function touch() {
   public function switch_to_frame($frame = null, $curl_opts = array()) {
     if (is_a($frame, "PHPWebDriver_WebDriverElement")) {
       $frame_id = array("id" => array("ELEMENT" => $frame->getId()));
+    } elseif ($frame == null) {
+      $frame_id = null;
     } else {
       throw new InvalidArgumentException('$frame needs to be a webdriver element of a frame');
     }
@@ -243,4 +245,4 @@ protected function getElementPath($element_id) {
     return sprintf('%s/element/%s', $this->url, $element_id);
   }
 }
-?>
+?>

test/FrameTest.php

@@ -26,6 +26,6 @@ public function test_frame_stuff() {
     $ps = self::$session->elements("css selector", "p");
     $this->assertEquals(count($ps), 6);
     // switch back
-    self::$session->frame();
+    self::$session->switch_to_frame();
   }
 }