Update specs and add service environment variable

aguspe · aguspe · commit 18a140a1d252 · 2024-09-14T10:44:31.000+02:00
diff --git a/rb/lib/selenium/webdriver/chrome/service.rb b/rb/lib/selenium/webdriver/chrome/service.rb
@@ -24,6 +24,7 @@ class Service < WebDriver::Service
         DEFAULT_PORT = 9515
         EXECUTABLE = 'chromedriver'
         SHUTDOWN_SUPPORTED = true
+        DRIVER_PATH_ENV_KEY = 'SE_CHROMEDRIVER'
 
         def log
           return @log unless @log.is_a? String
diff --git a/rb/lib/selenium/webdriver/common/service.rb b/rb/lib/selenium/webdriver/common/service.rb
@@ -102,10 +102,7 @@ def find_driver_path
       end
 
       def env_path
-        class_name = self.class.name&.split('::')&.[](2)&.downcase
-        driver_name = class_name == 'firefox' ? 'gecko' : class_name
-        parsed_driver = "SE_#{driver_name&.upcase}DRIVER"
-        ENV.fetch(parsed_driver, nil)
+        ENV.fetch(self.class::DRIVER_PATH_ENV_KEY, nil)
       end
     end # Service
   end # WebDriver
diff --git a/rb/lib/selenium/webdriver/edge/service.rb b/rb/lib/selenium/webdriver/edge/service.rb
@@ -24,6 +24,7 @@ class Service < WebDriver::Service
         DEFAULT_PORT = 9515
         EXECUTABLE = 'msedgedriver'
         SHUTDOWN_SUPPORTED = true
+        DRIVER_PATH_ENV_KEY = 'SE_EDGEDRIVER'
         def log
           return @log unless @log.is_a? String
 
diff --git a/rb/lib/selenium/webdriver/firefox/service.rb b/rb/lib/selenium/webdriver/firefox/service.rb
@@ -24,6 +24,7 @@ class Service < WebDriver::Service
         DEFAULT_PORT = 4444
         EXECUTABLE = 'geckodriver'
         SHUTDOWN_SUPPORTED = false
+        DRIVER_PATH_ENV_KEY = 'SE_GECKODRIVER'
       end # Service
     end # Firefox
   end # WebDriver
diff --git a/rb/lib/selenium/webdriver/ie/service.rb b/rb/lib/selenium/webdriver/ie/service.rb
@@ -24,6 +24,7 @@ class Service < WebDriver::Service
         DEFAULT_PORT = 5555
         EXECUTABLE = 'IEDriverServer'
         SHUTDOWN_SUPPORTED = true
+        DRIVER_PATH_ENV_KEY = 'SE_IEDRIVER'
       end # Server
     end # IE
   end # WebDriver
diff --git a/rb/lib/selenium/webdriver/safari/service.rb b/rb/lib/selenium/webdriver/safari/service.rb
@@ -24,6 +24,7 @@ class Service < WebDriver::Service
         DEFAULT_PORT = 7050
         EXECUTABLE = 'safaridriver'
         SHUTDOWN_SUPPORTED = false
+        DRIVER_PATH_ENV_KEY = 'SE_SAFARIDRIVER'
         def initialize(path: nil, port: nil, log: nil, args: nil)
           raise Error::WebDriverError, 'Safari Service does not support setting log output' if log
 
diff --git a/rb/sig/lib/selenium/webdriver/chrome/service.rbs b/rb/sig/lib/selenium/webdriver/chrome/service.rbs
@@ -2,6 +2,8 @@ module Selenium
   module WebDriver
     module Chrome
       class Service < WebDriver::Service
+        DRIVER_PATH_ENV_KEY: String
+
         @log: untyped
 
         DEFAULT_PORT: Integer
diff --git a/rb/sig/lib/selenium/webdriver/edge/service.rbs b/rb/sig/lib/selenium/webdriver/edge/service.rbs
@@ -2,6 +2,8 @@ module Selenium
   module WebDriver
     module Edge
       class Service < WebDriver::Service
+        DRIVER_PATH_ENV_KEY: String
+
         @log: untyped
 
         DEFAULT_PORT: Integer
diff --git a/rb/sig/lib/selenium/webdriver/firefox/service.rbs b/rb/sig/lib/selenium/webdriver/firefox/service.rbs
@@ -4,6 +4,7 @@ module Selenium
       class Service < WebDriver::Service
         DEFAULT_PORT: 4444
 
+        DRIVER_PATH_ENV_KEY: String
         EXECUTABLE: "geckodriver"
 
         SHUTDOWN_SUPPORTED: false
diff --git a/rb/sig/lib/selenium/webdriver/ie/service.rbs b/rb/sig/lib/selenium/webdriver/ie/service.rbs
@@ -4,6 +4,7 @@ module Selenium
       class Service < WebDriver::Service
         DEFAULT_PORT: Integer
 
+        DRIVER_PATH_ENV_KEY: String
         EXECUTABLE: String
 
         SHUTDOWN_SUPPORTED: bool
diff --git a/rb/sig/lib/selenium/webdriver/safari/service.rbs b/rb/sig/lib/selenium/webdriver/safari/service.rbs
@@ -4,6 +4,7 @@ module Selenium
       class Service < WebDriver::Service
         DEFAULT_PORT: Integer
 
+        DRIVER_PATH_ENV_KEY: String
         EXECUTABLE: String
 
         SHUTDOWN_SUPPORTED: bool
diff --git a/rb/spec/integration/selenium/webdriver/chrome/service_spec.rb b/rb/spec/integration/selenium/webdriver/chrome/service_spec.rb
@@ -37,6 +37,23 @@ module Chrome
         it 'can be started outside driver' do
           expect(service_manager.uri).to be_a(URI)
         end
+
+        context 'with a path env variable' do
+          before { ENV['SE_CHROMEDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
+
+          after { ENV.delete('SE_CHROMEDRIVER') }
+
+          it 'uses the path from the environment' do
+            expect(service.executable_path).to match(/chromedriver/)
+          end
+
+          it 'updates the path after setting the environment variable' do
+            ENV['SE_CHROMEDRIVER'] = '/foo/bar'
+            service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
+
+            expect(service.executable_path).to match(/chromedriver/)
+          end
+        end
       end
     end # Chrome
   end # WebDriver
diff --git a/rb/spec/integration/selenium/webdriver/edge/service_spec.rb b/rb/spec/integration/selenium/webdriver/edge/service_spec.rb
@@ -37,6 +37,23 @@ module Edge
         it 'can be started outside driver' do
           expect(service_manager.uri).to be_a(URI)
         end
+
+        context 'with a path env variable' do
+          before { ENV['SE_EDGEDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
+
+          after { ENV.delete('SE_EDGEDRIVER') }
+
+          it 'uses the path from the environment' do
+            expect(service.executable_path).to match(/edgedriver/)
+          end
+
+          it 'updates the path after setting the environment variable' do
+            ENV['SE_EDGEDRIVER'] = '/foo/bar'
+            service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
+
+            expect(service.executable_path).to match(/edgedriver/)
+          end
+        end
       end
     end # Edge
   end # WebDriver
diff --git a/rb/spec/integration/selenium/webdriver/firefox/service_spec.rb b/rb/spec/integration/selenium/webdriver/firefox/service_spec.rb
@@ -37,6 +37,23 @@ module Firefox
         it 'can be started outside driver' do
           expect(service_manager.uri).to be_a(URI)
         end
+
+        context 'with a path env variable' do
+          before { ENV['SE_GECKODRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
+
+          after { ENV.delete('SE_GECKODRIVER') }
+
+          it 'uses the path from the environment' do
+            expect(service.executable_path).to match(/geckodriver/)
+          end
+
+          it 'updates the path after setting the environment variable' do
+            ENV['SE_GECKODRIVER'] = '/foo/bar'
+            service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
+
+            expect(service.executable_path).to match(/geckodriver/)
+          end
+        end
       end
     end # Firefox
   end # WebDriver
diff --git a/rb/spec/integration/selenium/webdriver/ie/service_spec.rb b/rb/spec/integration/selenium/webdriver/ie/service_spec.rb
@@ -37,6 +37,23 @@ module IE
         it 'can be started outside driver' do
           expect(service_manager.uri).to be_a(URI)
         end
+
+        context 'with a path env variable' do
+          before { ENV['SE_IEDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
+
+          after { ENV.delete('SE_IEDRIVER') }
+
+          it 'uses the path from the environment' do
+            expect(service.executable_path).to match(/iedriver/)
+          end
+
+          it 'updates the path after setting the environment variable' do
+            ENV['SE_IEDRIVER'] = '/foo/bar'
+            service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
+
+            expect(service.executable_path).to match(/iedriver/)
+          end
+        end
       end
     end # IE
   end # WebDriver
diff --git a/rb/spec/integration/selenium/webdriver/safari/service_spec.rb b/rb/spec/integration/selenium/webdriver/safari/service_spec.rb
@@ -37,6 +37,23 @@ module Safari
         it 'can be started outside driver' do
           expect(service_manager.uri).to be_a(URI)
         end
+
+        context 'with a path env variable' do
+          before { ENV['SE_SAFARIDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
+
+          after { ENV.delete('SE_SAFARIDRIVER') }
+
+          it 'uses the path from the environment' do
+            expect(service.executable_path).to match(/safaridriver/)
+          end
+
+          it 'updates the path after setting the environment variable' do
+            ENV['SE_SAFARIDRIVER'] = '/foo/bar'
+            service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
+
+            expect(service.executable_path).to match(/safaridriver/)
+          end
+        end
       end
     end # Safari
   end # WebDriver
diff --git a/rb/spec/unit/selenium/webdriver/chrome/service_spec.rb b/rb/spec/unit/selenium/webdriver/chrome/service_spec.rb
@@ -119,23 +119,6 @@ module Chrome
             driver.new(service: service)
             expect(described_class).not_to have_received(:new)
           end
-
-          context 'with a path env variable' do
-            before { ENV['SE_CHROMEDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
-
-            after { ENV.delete('SE_CHROMEDRIVER') }
-
-            it 'uses the path from the environment' do
-              expect(service_manager.uri).to be_a(URI)
-            end
-
-            it 'updates the path after setting the environment variable' do
-              ENV['SE_CHROMEDRIVER'] = '/foo/bar'
-              service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
-
-              expect(service_manager.uri).to be_a(URI)
-            end
-          end
         end
       end
     end # Chrome
diff --git a/rb/spec/unit/selenium/webdriver/edge/service_spec.rb b/rb/spec/unit/selenium/webdriver/edge/service_spec.rb
@@ -129,23 +129,6 @@ module Edge
             expect(service.log).to be_nil
             expect(service.args).to eq ['--log-path=/path/to/log.txt']
           end
-
-          context 'with a path env variable' do
-            before { ENV['SE_EDGEDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
-
-            after { ENV.delete('SE_EDGEDRIVER') }
-
-            it 'uses the path from the environment' do
-              expect(service_manager.uri).to be_a(URI)
-            end
-
-            it 'updates the path after setting the environment variable' do
-              ENV['SE_EDGEDRIVER'] = '/foo/bar'
-              service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
-
-              expect(service_manager.uri).to be_a(URI)
-            end
-          end
         end
       end
     end # Edge
diff --git a/rb/spec/unit/selenium/webdriver/firefox/service_spec.rb b/rb/spec/unit/selenium/webdriver/firefox/service_spec.rb
@@ -117,23 +117,6 @@ module Firefox
 
             expect(described_class).not_to have_received(:new)
           end
-
-          context 'with a path env variable' do
-            before { ENV['SE_GECKODRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
-
-            after { ENV.delete('SE_GECKODRIVER') }
-
-            it 'uses the path from the environment' do
-              expect(service_manager.uri).to be_a(URI)
-            end
-
-            it 'updates the path after setting the environment variable' do
-              ENV['SE_GECKODRIVER'] = '/foo/bar'
-              service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
-
-              expect(service_manager.uri).to be_a(URI)
-            end
-          end
         end
       end
     end # Firefox
diff --git a/rb/spec/unit/selenium/webdriver/ie/service_spec.rb b/rb/spec/unit/selenium/webdriver/ie/service_spec.rb
@@ -119,23 +119,6 @@ module IE
 
             expect(described_class).not_to have_received(:new)
           end
-
-          context 'with a path env variable' do
-            before { ENV['SE_IEIDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
-
-            after { ENV.delete('SE_IEIDRIVER') }
-
-            it 'uses the path from the environment' do
-              expect(service_manager.uri).to be_a(URI)
-            end
-
-            it 'updates the path after setting the environment variable' do
-              ENV['SE_IEIDRIVER'] = '/foo/bar'
-              service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
-
-              expect(service_manager.uri).to be_a(URI)
-            end
-          end
         end
       end
     end # IE
diff --git a/rb/spec/unit/selenium/webdriver/safari/service_spec.rb b/rb/spec/unit/selenium/webdriver/safari/service_spec.rb
@@ -114,23 +114,6 @@ module Safari
 
             expect(described_class).not_to have_received(:new)
           end
-
-          context 'with a path env variable' do
-            before { ENV['SE_SAFARIDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path }
-
-            after { ENV.delete('SE_SAFARIDRIVER') }
-
-            it 'uses the path from the environment' do
-              expect(service_manager.uri).to be_a(URI)
-            end
-
-            it 'updates the path after setting the environment variable' do
-              ENV['SE_SAFARIDRIVER'] = '/foo/bar'
-              service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
-
-              expect(service_manager.uri).to be_a(URI)
-            end
-          end
         end
       end
     end # Safari
