[java] Selenium Manager use binary from Browser Options

diemol · diemol · commit 1a486c40ccb1 · 2023-04-17T16:15:48.000+02:00
#11351
diff --git a/java/java.iml b/java/java.iml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
+  <component name="ModuleRunConfigurationManager">
+    <shared />
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
     <output url="file://$MODULE_DIR$/build/production" />
     <output-test url="file://$MODULE_DIR$/build/test" />
@@ -24,4 +27,4 @@
     <option name="useAlternativeWorkingDir" value="false" />
     <option name="workingDirSelection" value="&lt;PROJECT&gt;" />
   </component>
-</module>
+</module>
diff --git a/java/src/org/openqa/selenium/manager/SeleniumManager.java b/java/src/org/openqa/selenium/manager/SeleniumManager.java
@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
@@ -157,6 +158,29 @@ private synchronized File getBinary() {
         return binary;
     }
 
+    /**
+     * Returns the browser binary path when present in the vendor options
+     *
+     * @param options browser options used to start the session
+     * @return the browser binary path when present, only Chrome/Firefox/Edge
+     */
+    private String getBrowserBinary(Capabilities options) {
+        List<String> vendorOptionsCapabilities = Arrays.asList("moz:firefoxOptions", "goog:chromeOptions", "ms:edgeOptions");
+        for (String vendorOptionsCapability : vendorOptionsCapabilities) {
+            if (options.asMap().containsKey(vendorOptionsCapability)) {
+                try {
+                    @SuppressWarnings("unchecked")
+                    Map<String, Object> vendorOptions = (Map<String, Object>) options.getCapability(vendorOptionsCapability);
+                    return (String) vendorOptions.get("binary");
+                } catch (Exception e) {
+                    LOG.warning(String.format("Exception while retrieving the browser binary path. %s: %s",
+                                              options, e.getMessage()));
+                }
+            }
+        }
+        return null;
+    }
+
     /**
      * Determines the location of the correct driver.
      * @param options Browser Options instance.
@@ -175,6 +199,12 @@ public String getDriverPath(Capabilities options) {
         if (!options.getBrowserVersion().isEmpty()) {
             commandList.addAll(Arrays.asList("--browser-version", options.getBrowserVersion()));
         }
+
+        String browserBinary = getBrowserBinary(options);
+        if (browserBinary != null && !browserBinary.isEmpty()) {
+            commandList.addAll(Arrays.asList("--browser-path", browserBinary));
+        }
+
         return runCommand(commandList.toArray(new String[0]));
     }
 }
