Skip to content

Commit ade027b

Browse files
committed
baseUrl should be prepended after exploding variables. Fixes #4540
1 parent 4aeed7b commit ade027b

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

java/client/src/com/thoughtworks/selenium/webdriven/commands/Open.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ public Open(String baseUrl) {
3939
@Override
4040
protected Void handleSeleneseCommand(final WebDriver driver, String url, String ignored) {
4141
try {
42-
final String urlToOpen = url.indexOf("://") == -1 ?
43-
new URL(baseUrl, url).toString() :
44-
url;
42+
final String urlToOpen = url.contains("://") ? url : new URL(baseUrl, url).toString();
4543

4644
driver.get(urlToOpen);
4745
} catch (MalformedURLException e) {

java/client/src/com/thoughtworks/selenium/webdriven/commands/OpenWindow.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ public OpenWindow(String baseUrl, GetEval opener) {
4242
protected Void handleSeleneseCommand(final WebDriver driver, final String url,
4343
final String windowID) {
4444
try {
45-
final String urlToOpen = url.indexOf("://") == -1 ?
46-
new URL(baseUrl, url).toString() :
47-
url;
45+
final String urlToOpen = url.contains("://") ? url : new URL(baseUrl, url).toString();
4846

4947
String[] args = {String.format("window.open('%s', '%s'); null;", urlToOpen, windowID)};
5048

java/server/src/org/openqa/selenium/server/htmlrunner/CoreTestCase.java

-9
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,6 @@ private List<LoggableStep> findCommands(WebDriver driver, URL baseUrl) {
134134
throw new SeleniumException("Unknown command: " + step.get(0));
135135
}
136136
String value = step.get(1);
137-
if (baseUrl != null && "open".equals(step.get(0)) || "openWindow".equals(step.get(0))) {
138-
try {
139-
value = value.indexOf("://") == -1 ?
140-
new URL(baseUrl, value).toString() :
141-
value;
142-
} catch (MalformedURLException e) {
143-
throw new SeleniumException("Unable to determine URL to open: " + value);
144-
}
145-
}
146137
steps.add(new LoggableStep(
147138
STEP_FACTORY.get(step.get(0)).create(value, step.get(2)),
148139
step.get(0),

0 commit comments

Comments
 (0)