[java] Fixing InternetExplorerOptions.merge, it should ignore "se:ieO…

…ptions" and merge only real capabilities, "se:ieOptions" will be constructed automatically
SeleniumHQ · Feb 23, 2021 · 0da772d · 0da772d
1 parent 7d488f7
commit 0da772d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/java/client/src/org/openqa/selenium/ie/InternetExplorerOptions.java b/java/client/src/org/openqa/selenium/ie/InternetExplorerOptions.java
@@ -96,8 +96,12 @@ public InternetExplorerOptions(Capabilities source) {
   @Override
   public InternetExplorerOptions merge(Capabilities extraCapabilities) {
     InternetExplorerOptions newInstance = new InternetExplorerOptions();
-    this.asMap().forEach(newInstance::setCapability);
-    extraCapabilities.asMap().forEach(newInstance::setCapability);
+    this.asMap().entrySet().stream()
+      .filter(entry -> !entry.getKey().equals(IE_OPTIONS))
+      .forEach(entry -> newInstance.setCapability(entry.getKey(), entry.getValue()));
+    extraCapabilities.asMap().entrySet().stream()
+      .filter(entry -> !entry.getKey().equals(IE_OPTIONS))
+      .forEach(entry -> newInstance.setCapability(entry.getKey(), entry.getValue()));
     return newInstance;
   }
 

diff --git a/java/client/test/org/openqa/selenium/ie/InternetExplorerOptionsTest.java b/java/client/test/org/openqa/selenium/ie/InternetExplorerOptionsTest.java
@@ -121,9 +121,14 @@ public void mergingOptionsMergesArguments() {
     InternetExplorerOptions two = new InternetExplorerOptions();
     InternetExplorerOptions merged = one.merge(two);
 
-    assertThat(merged.asMap()).asInstanceOf(MAP)
+    Map<String, Object> asMap = merged.asMap();
+    assertThat(asMap)
       .containsEntry(FORCE_CREATE_PROCESS, true)
       .extractingByKey(IE_SWITCHES).asInstanceOf(LIST)
       .containsExactly("-private");
+    assertThat(asMap)
+      .extractingByKey(IE_OPTIONS).asInstanceOf(MAP)
+      .containsEntry(FORCE_CREATE_PROCESS, true)
+      .extractingByKey(IE_SWITCHES).isEqualTo("-private");
   }
 }