Merge branch 'trunk' into sm_mixed_output

SeleniumHQ · May 17, 2024 · 5ab0c80 · 5ab0c80
2 parents bf4516f + 51eaaa6
commit 5ab0c80
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/rb/.rubocop.yml b/rb/.rubocop.yml
@@ -21,6 +21,7 @@ Layout/SpaceInsideHashLiteralBraces:
 Metrics/AbcSize:
   Max: 30
   Exclude:
+    - 'lib/selenium/webdriver/common/driver_finder.rb'
     - 'lib/selenium/webdriver/common/options.rb'
     - 'lib/selenium/webdriver/remote/capabilities.rb'
     - 'lib/selenium/webdriver/remote/http/curb.rb'
@@ -55,6 +56,7 @@ Metrics/MethodLength:
     - 'lib/selenium/server.rb'
     - 'lib/selenium/webdriver/common/options.rb'
     - 'lib/selenium/webdriver/common/driver.rb'
+    - 'lib/selenium/webdriver/common/driver_finder.rb'
     - 'lib/selenium/webdriver/remote/http/default.rb'
 
 Metrics/ModuleLength:

diff --git a/rb/CHANGES b/rb/CHANGES
@@ -1,3 +1,8 @@
+4.21.1 (2024-05-16)
+=========================
+
+* Fixed missing Chrome binary error in Rails system tests.
+
 4.21.0 (2024-05-16)
 =========================
 

diff --git a/rb/lib/selenium/webdriver/common/driver_finder.rb b/rb/lib/selenium/webdriver/common/driver_finder.rb
@@ -59,7 +59,14 @@ def paths
             formatted = {driver_path: Platform.cygwin_path(output['driver_path'], only_cygwin: true),
                          browser_path: Platform.cygwin_path(output['browser_path'], only_cygwin: true)}
             Platform.assert_executable(formatted[:driver_path])
-            Platform.assert_executable(formatted[:browser_path])
+
+            browser_path = formatted[:browser_path]
+            Platform.assert_executable(browser_path)
+            if @options.respond_to?(:binary) && @options.binary.nil?
+              @options.binary = browser_path
+              @options.browser_version = nil
+            end
+
             formatted
           end
         rescue StandardError => e