Use all provided options while merging them for Firefox (#13582)

* Use all provided options while merging them for Firefox

This fix addresses the discrepancy that we have in methods of processing browser options for Chromium and Firefox. In the case of Chromium, if the option name doesn't match any of previously processed, we add it anyway. It doesn't happen for Firefox. So in the case when one option is set in stereotype, but other is provided in capabilities this second one is missed from the result.

Unit test updated to cover this case.

* fixed formatting in SessionCapabilitiesMutatorTest

Author: oleg-rd

java/src/org/openqa/selenium/grid/node/config/SessionCapabilitiesMutator.java

@@ -171,6 +171,8 @@ private Map<String, Object> mergeFirefoxOptions(
       Map<String, Object> stereotypeOptions, Map<String, Object> capsOptions) {
     Map<String, Object> toReturn = new HashMap<>(stereotypeOptions);
 
+    List<String> handledOptions = List.of("args", "prefs", "profile", "log", "binary");
+
     for (Map.Entry<String, Object> entry : capsOptions.entrySet()) {
       String name = entry.getKey();
       Object value = entry.getValue();
@@ -215,6 +217,14 @@ private Map<String, Object> mergeFirefoxOptions(
         Map<String, Object> logLevelMap = (Map<String, Object>) value;
         toReturn.put("log", logLevelMap);
       }
+
+      if (name.equals("binary") && !stereotypeOptions.containsKey("binary")) {
+        toReturn.put(name, value);
+      }
+
+      if (!handledOptions.contains(name)) {
+        toReturn.put(name, value);
+      }
     }
 
     return toReturn;

java/test/org/openqa/selenium/grid/node/config/SessionCapabilitiesMutatorTest.java

@@ -238,6 +238,7 @@ void shouldMergeFirefoxSpecificOptionsFromStereotypeAndCaps() {
     stereotypeOptions.put("log", debugLog);
 
     stereotypeOptions.put("profile", "profile-string");
+    stereotypeOptions.put("androidDeviceSerial", "emulator-5556");
 
     stereotype =
         new ImmutableCapabilities(
@@ -260,6 +261,7 @@ void shouldMergeFirefoxSpecificOptionsFromStereotypeAndCaps() {
     capabilityOptions.put("profile", "different-profile-string");
 
     capabilityOptions.put("binary", "/path/to/caps/binary");
+    capabilityOptions.put("androidPackage", "com.android.chrome");
 
     capabilities =
         new ImmutableCapabilities(
@@ -304,6 +306,20 @@ void shouldMergeFirefoxSpecificOptionsFromStereotypeAndCaps() {
         .extractingByKey("profile")
         .asInstanceOf(STRING)
         .isEqualTo("different-profile-string");
+
+    assertThat(modifiedCapabilities)
+        .extractingByKey("moz:firefoxOptions")
+        .asInstanceOf(MAP)
+        .extractingByKey("androidDeviceSerial")
+        .asInstanceOf(STRING)
+        .isEqualTo("emulator-5556");
+
+    assertThat(modifiedCapabilities)
+        .extractingByKey("moz:firefoxOptions")
+        .asInstanceOf(MAP)
+        .extractingByKey("androidPackage")
+        .asInstanceOf(STRING)
+        .isEqualTo("com.android.chrome");
   }
 
   @Test