Update environment to be working now

aguspe · aguspe · commit 09d6cb16c6d7 · 2024-09-06T11:03:32.000+02:00
diff --git a/rb/lib/selenium/webdriver/chrome/service.rb b/rb/lib/selenium/webdriver/chrome/service.rb
@@ -24,7 +24,6 @@ class Service < WebDriver::Service
         DEFAULT_PORT = 9515
         EXECUTABLE = 'chromedriver'
         SHUTDOWN_SUPPORTED = true
-        PATH = ENV.fetch('SE_CHROMEDRIVER', nil)
 
         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
@@ -71,7 +71,7 @@ def driver_path=(path)
       def initialize(path: nil, port: nil, log: nil, args: nil)
         port ||= self.class::DEFAULT_PORT
         args ||= []
-        path ||= self.class::PATH
+        path ||= env_path
 
         @executable_path = path
         @host = Platform.localhost
@@ -90,7 +90,7 @@ def initialize(path: nil, port: nil, log: nil, args: nil)
       end
 
       def launch
-        @executable_path ||= self.class::PATH || find_driver_path
+        @executable_path ||= env_path || find_driver_path
         ServiceManager.new(self).tap(&:start)
       end
 
@@ -102,6 +102,13 @@ def find_driver_path
         default_options = WebDriver.const_get("#{self.class.name&.split('::')&.[](2)}::Options").new
         DriverFinder.new(default_options, self).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)
+      end
     end # Service
   end # WebDriver
 end # Selenium
diff --git a/rb/lib/selenium/webdriver/edge/service.rb b/rb/lib/selenium/webdriver/edge/service.rb
@@ -24,7 +24,6 @@ class Service < WebDriver::Service
         DEFAULT_PORT = 9515
         EXECUTABLE = 'msedgedriver'
         SHUTDOWN_SUPPORTED = true
-        PATH = ENV.fetch('SE_EDGEDRIVER', nil)
         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,7 +24,6 @@ class Service < WebDriver::Service
         DEFAULT_PORT = 4444
         EXECUTABLE = 'geckodriver'
         SHUTDOWN_SUPPORTED = false
-        PATH = ENV.fetch('SE_GECKODRIVER', nil)
       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,7 +24,6 @@ class Service < WebDriver::Service
         DEFAULT_PORT = 5555
         EXECUTABLE = 'IEDriverServer'
         SHUTDOWN_SUPPORTED = true
-        PATH = ENV.fetch('SE_IEDRIVER', nil)
       end # Server
     end # IE
   end # WebDriver
diff --git a/rb/sig/lib/selenium/webdriver/chrome/service.rbs b/rb/sig/lib/selenium/webdriver/chrome/service.rbs
@@ -2,8 +2,6 @@ module Selenium
   module WebDriver
     module Chrome
       class Service < WebDriver::Service
-        PATH: String
-
         @log: untyped
 
         DEFAULT_PORT: Integer
diff --git a/rb/sig/lib/selenium/webdriver/common/service.rbs b/rb/sig/lib/selenium/webdriver/common/service.rbs
@@ -47,6 +47,8 @@ module Selenium
 
       attr_accessor args: untyped
 
+      def env_path: -> String
+
       alias extra_args args
 
       def initialize: (?path: untyped?, ?port: untyped?, ?log: untyped?, ?args: untyped?) -> void
diff --git a/rb/sig/lib/selenium/webdriver/edge/service.rbs b/rb/sig/lib/selenium/webdriver/edge/service.rbs
@@ -2,7 +2,6 @@ module Selenium
   module WebDriver
     module Edge
       class Service < WebDriver::Service
-        PATH: String
 
         @log: untyped
 
diff --git a/rb/sig/lib/selenium/webdriver/ie/service.rbs b/rb/sig/lib/selenium/webdriver/ie/service.rbs
@@ -6,7 +6,6 @@ module Selenium
 
         EXECUTABLE: String
 
-        PATH: String
         SHUTDOWN_SUPPORTED: bool
       end
     end
diff --git a/rb/sig/lib/selenium/webdriver/safari/service.rbs b/rb/sig/lib/selenium/webdriver/safari/service.rbs
@@ -6,7 +6,6 @@ module Selenium
 
         EXECUTABLE: String
 
-        PATH: String
         SHUTDOWN_SUPPORTED: bool
 
         def initialize: (?path: untyped?, ?port: untyped?, ?log: untyped?, ?args: untyped?) -> void
diff --git a/rb/spec/integration/selenium/webdriver/chrome/service_spec.rb b/rb/spec/integration/selenium/webdriver/chrome/service_spec.rb
@@ -39,9 +39,16 @@ module Chrome
         end
 
         it 'uses the path from the environment' do
-          ENV['SE_CHROMEDRIVER'] = '/path/to/chromedriver'
+          ENV['SE_CHROMEDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path
 
-          expect(service.executable_path).to eq '/path/to/chromedriver'
+          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 # Chrome
diff --git a/rb/spec/integration/selenium/webdriver/edge/service_spec.rb b/rb/spec/integration/selenium/webdriver/edge/service_spec.rb
@@ -39,9 +39,16 @@ module Edge
         end
 
         it 'uses the path from the environment' do
-          ENV['SE_EDGEDRIVER'] = '/path/to/msedgedriver'
+          ENV['SE_EDGEDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path
 
-          expect(service.executable_path).to eq '/path/to/msedgedriver'
+          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 # Edge
diff --git a/rb/spec/integration/selenium/webdriver/firefox/service_spec.rb b/rb/spec/integration/selenium/webdriver/firefox/service_spec.rb
@@ -39,9 +39,16 @@ module Firefox
         end
 
         it 'uses the path from the environment' do
-          ENV['SE_GECKODRIVER'] = '/path/to/geckodriver'
+          ENV['SE_GECKODRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path
 
-          expect(service.executable_path).to eq '/path/to/geckodriver'
+          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 # Firefox
diff --git a/rb/spec/integration/selenium/webdriver/ie/service_spec.rb b/rb/spec/integration/selenium/webdriver/ie/service_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../spec_helper'
+
+module Selenium
+  module WebDriver
+    module IE
+      describe Service, exclusive: [{bidi: false, reason: 'Not yet implemented with BiDi'}, {browser: :ie}] do
+        let(:service) { described_class.new }
+        let(:service_manager) { service.launch }
+
+        after { service_manager.stop }
+
+        it 'auto uses iedriver' do
+          service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
+
+          expect(service_manager.uri).to be_a(URI)
+        end
+
+        it 'can be started outside driver' do
+          expect(service_manager.uri).to be_a(URI)
+        end
+
+        it 'uses the path from the environment' do
+          ENV['SE_IEIDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path
+
+          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 # IE
+  end # WebDriver
+end # Selenium
diff --git a/rb/spec/integration/selenium/webdriver/safari/service_spec.rb b/rb/spec/integration/selenium/webdriver/safari/service_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../spec_helper'
+
+module Selenium
+  module WebDriver
+    module Safari
+      describe Service, exclusive: [{bidi: false, reason: 'Not yet implemented with BiDi'}, {browser: :safari}] do
+        let(:service) { described_class.new }
+        let(:service_manager) { service.launch }
+
+        after { service_manager.stop }
+
+        it 'auto uses safaridriver' do
+          service.executable_path = DriverFinder.new(Options.new, described_class.new).driver_path
+
+          expect(service_manager.uri).to be_a(URI)
+        end
+
+        it 'can be started outside driver' do
+          expect(service_manager.uri).to be_a(URI)
+        end
+
+        it 'uses the path from the environment' do
+          ENV['SE_SAFARIDRIVER'] = DriverFinder.new(Options.new, described_class.new).driver_path
+
+          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 # Safari
+  end # WebDriver
+end # Selenium
