on osx for firefox, fallback to checking homebrew install, if the default isn't there

lukeis · lukeis · commit 21bbdf51b8b1 · 2016-01-07T11:33:14.000-08:00
diff --git a/java/client/src/org/openqa/selenium/firefox/internal/Executable.java b/java/client/src/org/openqa/selenium/firefox/internal/Executable.java
@@ -160,6 +160,10 @@ private static File locateFirefoxBinaryFromPlatform() {
 
     } else if (current.is(MAC)) {
       binary = new File("/Applications/Firefox.app/Contents/MacOS/firefox-bin");
+      // fall back to homebrew install location if default is not found
+      if (!binary.exists()) {
+        binary = new File(System.getProperty("user.home") + binary.getAbsolutePath());
+      }
     }
 
     if (binary != null && binary.exists()) {
diff --git a/py/selenium/webdriver/firefox/firefox_binary.py b/py/selenium/webdriver/firefox/firefox_binary.py
@@ -143,7 +143,10 @@ def _get_firefox_start_cmd(self):
         """Return the command to start firefox."""
         start_cmd = ""
         if platform.system() == "Darwin":
-            start_cmd = ("/Applications/Firefox.app/Contents/MacOS/firefox-bin")
+            start_cmd = "/Applications/Firefox.app/Contents/MacOS/firefox-bin"
+            # fallback to homebrew installation for mac users
+            if not os.path.exists(start_cmd):
+                start_cmd = os.path.expanduser("~") + start_cmd
         elif platform.system() == "Windows":
             start_cmd = (self._find_exe_in_registry() or
                 self._default_windows_location())

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,10 @@ private static File locateFirefoxBinaryFromPlatform() {`
`160`	`160`
`161`	`161`	`} else if (current.is(MAC)) {`
`162`	`162`	`binary = new File("/Applications/Firefox.app/Contents/MacOS/firefox-bin");`
	`163`	`+ // fall back to homebrew install location if default is not found`
	`164`	`+ if (!binary.exists()) {`
	`165`	`+ binary = new File(System.getProperty("user.home") + binary.getAbsolutePath());`
	`166`	`+ }`
`163`	`167`	`}`
`164`	`168`
`165`	`169`	`if (binary != null && binary.exists()) {`