SimonStewart: Applying patch from Amitabh Saikia that fixes the behav…

…iour of getCurrentUrl to report the URL of the frame we are switched to. This is issue SeleniumHQ#67 r5833
chrisirhc · Nov 13, 2008 · f240dfb · f240dfb
1 parent f6264f5
commit f240dfb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/CREDITS.txt b/CREDITS.txt
@@ -22,4 +22,5 @@ Marc Guillemot
 Alexis Vuillemin
 Noel Gordon
 David Wang
+Amitabh Saikia
 
diff --git a/common/test/java/org/openqa/selenium/FrameSwitchingTest.java b/common/test/java/org/openqa/selenium/FrameSwitchingTest.java
@@ -154,4 +154,18 @@ public void testShouldBeAbleToFindElementsInIframesByXPath() {
 
         assertNotNull(element);
     }
+
+    @Ignore("safari")
+    public void testGetCurrentUrl() {
+        driver.get(framesetPage);
+
+        driver.switchTo().frame("second");
+        assertThat(driver.getCurrentUrl(), equalTo("http://localhost:3000/page/2?title=Fish"));
+
+        driver.get(iframePage);
+        assertThat(driver.getCurrentUrl(), equalTo("http://localhost:3000/iframes.html"));
+
+        driver.switchTo().frame("iframe1");
+        assertThat(driver.getCurrentUrl(), equalTo("http://localhost:3000/formPage.html"));
+    }
 }
diff --git a/firefox/src/extension/components/context.js b/firefox/src/extension/components/context.js
@@ -1,13 +1,13 @@
 function Context(windowId, frameId) {
-    this.windowId = (windowId !== undefined ? windowId - 0 : 1) || 0;
+  this.windowId = (windowId !== undefined ? windowId - 0 : 1) || 0;
 
-    if (frameId) {
-		if (frameId.match(/^\d+$/g)) {
-        	this.frameId = frameId - 0;
-		} else {
-			this.frameId = frameId;
-		}
-	}
+  if (frameId) {
+    if (frameId.match(/^\d+$/g)) {
+      this.frameId = frameId - 0;
+    } else {
+      this.frameId = frameId;
+    }
+  }
 }
 
 Context.fromString = function(text) {
@@ -17,4 +17,4 @@ Context.fromString = function(text) {
 
 Context.prototype.toString = function() {
     return this.windowId + " " + (this.frameId !== undefined ? this.frameId : "");
-}
+}
diff --git a/firefox/src/extension/components/firefoxDriver.js b/firefox/src/extension/components/firefoxDriver.js
@@ -143,7 +143,11 @@ FirefoxDriver.prototype.executeScript = function(respond, script) {
 
 FirefoxDriver.prototype.getCurrentUrl = function(respond) {
     respond.context = this.context;
-    respond.response = "" + Utils.getBrowser(this.context).contentWindow.location;
+    var url = Utils.getDocument(this.context).location;
+    if (!url) {
+      url = Utils.getBrowser(this.context).contentWindow.location;
+    }
+    respond.response = "" + url;
     respond.send();
 }