WDBC: restoring backward compatibility after changes in getCurrentUrl semantics

barancev · barancev · commit e4f26e847020 · 2015-09-17T07:56:03.000+03:00
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/GetLocation.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/GetLocation.java
@@ -19,11 +19,12 @@
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
 
+import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 
 public class GetLocation extends SeleneseCommand<String> {
   @Override
   protected String handleSeleneseCommand(WebDriver driver, String ignored, String alsoIgnored) {
-    return driver.getCurrentUrl();
+    return ((JavascriptExecutor) driver).executeScript("return window.location.href").toString();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,12 @@`
`19`	`19`
`20`	`20`	`import com.thoughtworks.selenium.webdriven.SeleneseCommand;`
`21`	`21`
	`22`	`+import org.openqa.selenium.JavascriptExecutor;`
`22`	`23`	`import org.openqa.selenium.WebDriver;`
`23`	`24`
`24`	`25`	`public class GetLocation extends SeleneseCommand<String> {`
`25`	`26`	`@Override`
`26`	`27`	`protected String handleSeleneseCommand(WebDriver driver, String ignored, String alsoIgnored) {`
`27`		`- return driver.getCurrentUrl();`
	`28`	`+ return ((JavascriptExecutor) driver).executeScript("return window.location.href").toString();`
`28`	`29`	`}`
`29`	`30`	`}`