java: Implementing ability to switch to a frame by WebElement in marionette

Author: barancev

Diff for: java/client/src/org/openqa/selenium/firefox/internal/MarionetteConnection.java

@@ -23,6 +23,7 @@
 
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.WebElement;
 import org.openqa.selenium.firefox.ExtensionConnection;
 import org.openqa.selenium.firefox.FirefoxBinary;
 import org.openqa.selenium.firefox.FirefoxProfile;
@@ -295,6 +296,13 @@ private String serializeCommand(Command command) {
 
     } else if (DriverCommand.SET_ALERT_VALUE.equals(commandName)) {
       renameParameter(params, "text", "value");
+
+    } else if (DriverCommand.SWITCH_TO_FRAME.equals(commandName)) {
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=1143908
+      if (params.get("id") instanceof Map) {
+        params.put("element", ((Map<String, Object>) params.get("id")).get("ELEMENT"));
+        params.remove("id");
+      }
     }
 
     if (seleniumToMarionetteCommandMap.containsKey(commandName)) {
@@ -305,7 +313,6 @@ private String serializeCommand(Command command) {
     map.put("to", marionetteId != null ? marionetteId : "root");
     map.put("name", commandName);
     if (command.getSessionId() != null) {
-      // See https://bugzilla.mozilla.org/show_bug.cgi?id=1073732
       map.put("sessionId", command.getSessionId().toString());
     }
     map.put("parameters", params);

Diff for: java/client/test/org/openqa/selenium/FrameSwitchingTest.java

@@ -74,7 +74,6 @@ public void testShouldNotAutomaticallySwitchFocusToAnIFrameWhenAPageContainingTh
 
   @Test(timeout = 10000)
   @NeedsLocalEnvironment(reason = "it hangs at IE9 and event Test.timeout doesn't help")
-  @Ignore(MARIONETTE)
   public void testShouldOpenPageWithBrokenFrameset() {
     driver.get(appServer.whereIs("framesetPage3.html"));
 
@@ -156,7 +155,6 @@ public void testShouldBeAbleToSwitchToFrameWithNameContainingDot() {
     assertThat(driver.findElement(By.tagName("body")).getText(), containsString("Page number 3"));
   }
 
-  @Ignore({MARIONETTE})
   @Test
   public void testShouldBeAbleToSwitchToAFrameUsingAPreviouslyLocatedWebElement() {
     driver.get(pages.framesetPage);
@@ -166,7 +164,6 @@ public void testShouldBeAbleToSwitchToAFrameUsingAPreviouslyLocatedWebElement()
     assertThat(driver.findElement(By.id("pageNumber")).getText(), equalTo("1"));
   }
 
-  @Ignore(MARIONETTE)
   @Test
   public void testShouldBeAbleToSwitchToAnIFrameUsingAPreviouslyLocatedWebElement() {
     driver.get(pages.iframePage);
@@ -311,7 +308,6 @@ public void testShouldBeAbleToSwitchToParentFromAnIframe() {
   //
   // ----------------------------------------------------------------------------------------------
 
-  @Ignore({MARIONETTE})
   @Test
   public void testShouldContinueToReferToTheSameFrameOnceItHasBeenSelected() {
     driver.get(pages.framesetPage);