Skip to content

Commit 6e1cbc3

Browse files
committed
[java] Fixing InternetExplorerOptions constructor from a capabilites object. Fixes #9143
1 parent 4509339 commit 6e1cbc3

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

java/client/src/org/openqa/selenium/ie/InternetExplorerOptions.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ public InternetExplorerOptions() {
9292

9393
public InternetExplorerOptions(Capabilities source) {
9494
this();
95-
96-
merge(source);
95+
source.getCapabilityNames().forEach(name -> setCapability(name, source.getCapability(name)));
9796
}
9897

9998
@Override

java/client/test/org/openqa/selenium/ie/InternetExplorerOptionsTest.java

+15
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
package org.openqa.selenium.ie;
1919

2020
import static org.assertj.core.api.Assertions.assertThat;
21+
import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
2122
import static org.assertj.core.api.InstanceOfAssertFactories.MAP;
23+
import static org.openqa.selenium.ie.InternetExplorerDriver.FORCE_CREATE_PROCESS;
24+
import static org.openqa.selenium.ie.InternetExplorerDriver.IE_SWITCHES;
2225
import static org.openqa.selenium.ie.InternetExplorerDriver.INITIAL_BROWSER_URL;
2326
import static org.openqa.selenium.ie.InternetExplorerDriver.INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS;
2427
import static org.openqa.selenium.ie.InternetExplorerOptions.IE_OPTIONS;
@@ -111,4 +114,16 @@ public void shouldSetIeOptionsCapabilityWhenConstructedFromExistingCapabilities(
111114

112115
assertThat(seen.getCapability(IE_OPTIONS)).isEqualTo(expected.getCapability(IE_OPTIONS));
113116
}
117+
118+
@Test
119+
public void mergingOptionsMergesArguments() {
120+
InternetExplorerOptions one = new InternetExplorerOptions().useCreateProcessApiToLaunchIe().addCommandSwitches("-private");
121+
InternetExplorerOptions two = new InternetExplorerOptions();
122+
InternetExplorerOptions merged = one.merge(two);
123+
124+
assertThat(merged.asMap()).asInstanceOf(MAP)
125+
.containsEntry(FORCE_CREATE_PROCESS, true)
126+
.extractingByKey(IE_SWITCHES).asInstanceOf(LIST)
127+
.containsExactly("-private");
128+
}
114129
}

0 commit comments

Comments
 (0)