Firefox: changing getCurrentUrl to return top level browsing context address (to conform to the standard)

Author: barancev

java/client/test/org/openqa/selenium/FrameSwitchingTest.java

@@ -31,7 +31,6 @@
 import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
 import static org.openqa.selenium.testing.Ignore.Driver.ALL;
 import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
-import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
 import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Ignore.Driver.IE;
 import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
@@ -417,7 +416,7 @@ public void testShouldBeAbleToFindElementsInIframesByXPath() {
     assertNotNull(element);
   }
 
-  @Ignore({CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI})
+  @Ignore({CHROME, HTMLUNIT, IE, PHANTOMJS, SAFARI})
   @Test
   public void testGetCurrentUrlReturnsTopLevelBrowsingContextUrl() {
     driver.get(pages.framesetPage);
@@ -427,13 +426,13 @@ public void testGetCurrentUrlReturnsTopLevelBrowsingContextUrl() {
     assertThat(driver.getCurrentUrl(), equalTo(pages.framesetPage));
   }
 
-  @Ignore({CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI, MARIONETTE})
+  @Ignore({CHROME, HTMLUNIT, IE, PHANTOMJS, SAFARI, MARIONETTE})
   @Test
   public void testGetCurrentUrlReturnsTopLevelBrowsingContextUrlForIframes() {
     driver.get(pages.iframePage);
     assertThat(driver.getCurrentUrl(), equalTo(pages.iframePage));
 
-    driver.switchTo().frame("second");
+    driver.switchTo().frame("iframe1");
     assertThat(driver.getCurrentUrl(), equalTo(pages.iframePage));
   }
 

javascript/firefox-driver/js/firefoxDriver.js

@@ -98,15 +98,7 @@ FirefoxDriver.prototype.getCurrentWindowHandle = function(respond) {
 
 
 FirefoxDriver.prototype.getCurrentUrl = function(respond) {
-  var window = respond.session.getWindow();
-  var url;
-  if (window) {
-    url = window.location;
-  }
-  if (!url) {
-    url = respond.session.getBrowser().contentWindow.location;
-  }
-  respond.value = '' + url;
+  respond.value = '' + respond.session.getBrowser().contentWindow.location;
   respond.send();
 };