[rb] accommodate Driver Finder being sent something other than an Options instance

titusfortner · titusfortner · commit 49fb5291d4d8 · 2023-03-25T19:17:33.000-05:00
diff --git a/rb/lib/selenium/webdriver/common/driver_finder.rb b/rb/lib/selenium/webdriver/common/driver_finder.rb
@@ -27,7 +27,7 @@ def self.path(options, klass)
 
         path ||= begin
           SeleniumManager.driver_path(options)
-        rescue Error::WebDriverError => e
+        rescue StandardError => e
           WebDriver.logger.debug("Unable obtain driver using Selenium Manager\n #{e.message}")
           nil
         end
diff --git a/rb/lib/selenium/webdriver/common/selenium_manager.rb b/rb/lib/selenium/webdriver/common/selenium_manager.rb
@@ -33,11 +33,11 @@ class << self
         # @param [Options] options browser options.
         # @return [String] the path to the correct driver.
         def driver_path(options)
-          message = "driver for #{options.browser_name} not found; attempting to install with Selenium Manager"
+          message = 'applicable driver not found; attempting to install with Selenium Manager'
           WebDriver.logger.warn(message)
 
           unless options.is_a?(Options)
-            raise ArgumentError, "SeleniumManager requires a WebDriver::Options instance, not a #{options.inspect}"
+            raise ArgumentError, "SeleniumManager requires a WebDriver::Options instance, not #{options.inspect}"
           end
 
           command = [binary, '--browser', options.browser_name, '--output', 'json']
diff --git a/rb/spec/unit/selenium/webdriver/chrome/driver_spec.rb b/rb/spec/unit/selenium/webdriver/chrome/driver_spec.rb
@@ -45,8 +45,8 @@ def expect_request(body: nil, endpoint: nil)
         end
 
         it 'uses DriverFinder when provided Service without path' do
-          expect_request
           allow(DriverFinder).to receive(:path)
+          expect_request
           options = Options.new
 
           described_class.new(service: service, options: options)
@@ -96,6 +96,8 @@ def expect_request(body: nil, endpoint: nil)
         end
 
         context 'with :capabilities' do
+          before { allow(DriverFinder).to receive(:path) }
+
           it 'accepts value as a Symbol' do
             expect_request
             expect { described_class.new(capabilities: :chrome) }.to have_deprecated(:capabilities)
diff --git a/rb/spec/unit/selenium/webdriver/edge/driver_spec.rb b/rb/spec/unit/selenium/webdriver/edge/driver_spec.rb
@@ -101,6 +101,8 @@ def expect_request(body: nil, endpoint: nil)
         end
 
         context 'with :capabilities' do
+          before { allow(DriverFinder).to receive(:path) }
+
           it 'accepts value as a Symbol' do
             expect_request
             expect {
diff --git a/rb/spec/unit/selenium/webdriver/firefox/driver_spec.rb b/rb/spec/unit/selenium/webdriver/firefox/driver_spec.rb
@@ -100,6 +100,8 @@ def expect_request(body: nil, endpoint: nil)
         end
 
         context 'with :capabilities' do
+          before { allow(DriverFinder).to receive(:path) }
+
           it 'accepts value as a Symbol' do
             expect_request
             expect { described_class.new(capabilities: :firefox) }.to have_deprecated(:capabilities)
diff --git a/rb/spec/unit/selenium/webdriver/ie/driver_spec.rb b/rb/spec/unit/selenium/webdriver/ie/driver_spec.rb
@@ -98,6 +98,8 @@ def expect_request(body: nil, endpoint: nil)
         end
 
         context 'with :capabilities' do
+          before { allow(DriverFinder).to receive(:path) }
+
           it 'accepts value as a Symbol' do
             expect_request
             expect { described_class.new(capabilities: :ie) }.to have_deprecated(:capabilities)
