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

Author: lukeis

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()) {

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())