remove all references to firefox-bin

SeleniumHQ · Dec 31, 2023 · 6b42c10 · 6b42c10
1 parent 7784bbd
commit 6b42c10
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxBinary.java b/java/src/org/openqa/selenium/firefox/FirefoxBinary.java
@@ -240,14 +240,9 @@ private static Stream<Executable> locateFirefoxBinariesFromPlatform() {
       if (Files.isSymbolicLink(firefoxPath)) {
         try {
           Path realPath = firefoxPath.toRealPath();
-          File attempt1 = realPath.getParent().resolve("firefox").toFile();
-          if (attempt1.exists()) {
-            executables.add(new Executable(attempt1));
-          } else {
-            File attempt2 = realPath.getParent().resolve("firefox-bin").toFile();
-            if (attempt2.exists()) {
-              executables.add(new Executable(attempt2));
-            }
+          File file = realPath.getParent().resolve("firefox").toFile();
+          if (file.exists()) {
+            executables.add(new Executable(file));
           }
         } catch (IOException e) {
           // ignore this path

diff --git a/javascript/node/selenium-webdriver/firefox.js b/javascript/node/selenium-webdriver/firefox.js
@@ -796,7 +796,7 @@ Channel.RELEASE = new Channel(
  * @see <https://www.mozilla.org/en-US/firefox/channel/desktop/#nightly>
  */
 Channel.NIGHTLY = new Channel(
-  '/Applications/Firefox Nightly.app/Contents/MacOS/firefox-bin',
+  '/Applications/Firefox Nightly.app/Contents/MacOS/firefox',
   'Nightly\\firefox.exe'
 )
 

diff --git a/py/selenium/webdriver/firefox/firefox_binary.py b/py/selenium/webdriver/firefox/firefox_binary.py
@@ -162,7 +162,7 @@ def _get_firefox_start_cmd(self):
             start_cmd = self.which(ffname)
             # use hardcoded path if nothing else was found by which()
             if not start_cmd:
-                start_cmd = "/Applications/Firefox.app/Contents/MacOS/firefox-bin"
+                start_cmd = "/Applications/Firefox.app/Contents/MacOS/firefox"
             # fallback to homebrew installation for mac users
             if not os.path.exists(start_cmd):
                 start_cmd = os.path.expanduser("~") + start_cmd