Merge branch 'trunk' into rules_python2

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

diff --git a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb
index 6bca68a..81abfab 100644
--- a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb
+++ b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb
@@ -311,7 +311,7 @@
         end
 
         def chrome_options(args: [], **opts)
-          opts[:browser_version] = browser_version
+          opts[:browser_version] = browser_version unless ENV.key?('CHROME_BINARY')
           opts[:web_socket_url] = true if ENV['WEBDRIVER_BIDI'] && !opts.key?(:web_socket_url)
           opts[:binary] ||= rlocation(ENV['CHROME_BINARY']) if ENV.key?('CHROME_BINARY')
           args << '--headless' if ENV['HEADLESS']
@@ -322,7 +322,7 @@
         end
 
         def edge_options(args: [], **opts)
-          opts[:browser_version] = browser_version
+          opts[:browser_version] = browser_version unless ENV.key?('EDGE_BINARY')
           opts[:web_socket_url] = true if ENV['WEBDRIVER_BIDI'] && !opts.key?(:web_socket_url)
           opts[:binary] ||= rlocation(ENV['EDGE_BINARY']) if ENV.key?('EDGE_BINARY')
           args << '--headless' if ENV['HEADLESS']
@@ -333,7 +333,7 @@
         end
 
         def firefox_options(args: [], **opts)
-          opts[:browser_version] = browser_version
+          opts[:browser_version] = browser_version unless ENV.key?('FIREFOX_BINARY')
           opts[:web_socket_url] = true if ENV['WEBDRIVER_BIDI'] && !opts.key?(:web_socket_url)
           opts[:binary] ||= rlocation(ENV['FIREFOX_BINARY']) if ENV.key?('FIREFOX_BINARY')
           opts[:unhandled_prompt_behavior] ||= 'ignore'