selenium-webdriver 4.10.0 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57f5a526cd47137c459f2eb349f03fbebc28b428a4d1eba1aed962cb8b32f0d4
-  data.tar.gz: 0e246eec8fc308f54bb651245cebaf3610a5abf4f6027728a6e96210b72a397e
+  metadata.gz: dc5fa0275bc4e0f7675b6579bb652cb2efc20bc47797407a3c1da5cd3ac61959
+  data.tar.gz: 35d845b2fab6603c02c7c6d56f8b2e2e21aa956ed1fcbe01adc0ec0e1b4627d6
 SHA512:
-  metadata.gz: 679674b291a9b3da8d41a917ed782d14743150b524767a915e464e39751971ce9420e7a21127dcf10ca070f3bd7bff14a61690c028b013daab8d638550f38a61
-  data.tar.gz: a39c8fdecf8a60ad8736aa3392bba7f540c692bdba451546463b8db4e9b967d81d1d30ca665aedb99901e6f173deb3af29fcdfcd7d7c087783b8e24358ae8814
+  metadata.gz: 61ce01ca9e41da013f55b0a970f3c4fe68e496132fd3f70c7a4770e1874dfdbc3a0102e530cbc01e9e4cfc4dd02614eee6120366471e2e07da9cb0d097222e78
+  data.tar.gz: 00ebdefe7adc44e8d535a6ab2099ea6233d6a2d9d5c2960a93ac001c34657a7860857e3387c3c93053f034bcccda4dc8120325c105c16bd0ba7151acb8e1211e

data/CHANGES

@@ -1,3 +1,49 @@
+4.14.0 (Unreleased)
+=========================
+Ruby:
+  * allow users to access the full script of the atom directly
+
+BiDi:
+  * Released selenium-devtools 0.118.0 (supports CDP v85, v116, v117, v118)
+
+4.13.1 (2023-09-25)
+=========================
+Ruby:
+  * Fix bug preventing logging chromedriver to file
+
+4.13.0 (2023-09-25)
+=========================
+Ruby:
+  * Fix bug preventing using performance logging with chromium
+  * Allow users to set Selenium Manager path by environment variable (#12752)
+  * Allow service to be started before the driver
+  * remove deprecated driver extensions for location and network connection
+
+BiDi:
+  * Released selenium-devtools 0.117.0 (supports CDP v85, v115, v116, v117)
+
+4.12.0 (2023-08-31)
+=========================
+Ruby:
+  * Fix bug preventing good error messages in Selenium Manager when stdout empty
+  * Fix bug with Firefox not loading net/http library by default (#12506)
+  * Remove support for using capabilities in local drivers
+
+BiDi:
+  * Released selenium-devtools 0.116.0 (supports CDP v85, v114, v115, v116)
+
+4.11.0 (2023-07-31)
+=========================
+Ruby:
+  * Made network interception threads fail silently (#12226)
+  * Have Selenium Manager binary locate drivers on PATH (#12345)
+  * Add browser output from selenium manager to options (#12398)
+  * Remove deprecated code (#12417)
+BiDi:
+  * Released selenium-devtools 0.115.0 (supports CDP v85, v113, v114, v115)
+Edge:
+  * Adding ignore process match for IE Mode across bindings (#12279)
+
 4.10.0 (2023-06-07)
 =========================
 Ruby:

data/README.md

@@ -15,7 +15,7 @@ This gem provides Ruby bindings for Selenium and supports MRI >= 3.0.
 
 ## License
 
-Copyright 2009-2021 Software Freedom Conservancy
+Copyright 2009-2023 Software Freedom Conservancy
 
 Licensed to the Software Freedom Conservancy (SFC) under one
 or more contributor license agreements.  See the NOTICE file

data/lib/selenium/server.rb

@@ -18,6 +18,7 @@
 # under the License.
 
 require 'selenium/webdriver/common/child_process'
+require 'selenium/webdriver/common/port_prober'
 require 'selenium/webdriver/common/socket_poller'
 require 'net/http'
 
@@ -165,7 +166,7 @@ module Selenium
     # :standalone, #hub, #node
     #
 
-    attr_accessor :role, :port, :timeout, :background, :log
+    attr_accessor :role, :host, :port, :timeout, :background, :log
 
     #
     # @param [String] jar Path to the server jar.
@@ -185,7 +186,7 @@ module Selenium
       @jar = jar
       @host = '127.0.0.1'
       @role = opts.fetch(:role, 'standalone')
-      @port = opts.fetch(:port, 4444)
+      @port = opts.fetch(:port, WebDriver::PortProber.above(4444))
       @timeout = opts.fetch(:timeout, 30)
       @background = opts.fetch(:background, false)
       @additional_args = opts.fetch(:args, [])
@@ -207,12 +208,6 @@ module Selenium
     end
 
     def stop
-      begin
-        Net::HTTP.get(@host, '/selenium-server/driver/?cmd=shutDownSeleniumServer', @port)
-      rescue Errno::ECONNREFUSED
-        nil
-      end
-
       stop_process if @process
       poll_for_shutdown
 
@@ -234,13 +229,7 @@ module Selenium
     private
 
     def stop_process
-      return unless @process.alive?
-
-      begin
-        @process.poll_for_exit(5)
-      rescue WebDriver::ChildProcess::TimeoutError
-        @process.stop
-      end
+      @process.stop
     rescue Errno::ECHILD
       # already dead
     ensure
@@ -254,7 +243,6 @@ module Selenium
         args = ['-jar', @jar, @role, '--port', @port.to_s]
         server_command = ['java'] + properties + args + @additional_args
         cp = WebDriver::ChildProcess.build(*server_command)
-        WebDriver.logger.debug("Executing Process #{server_command}", id: :server)
 
         if @log.is_a?(String)
           cp.io = @log

data/lib/selenium/webdriver/atoms.rb

@@ -20,6 +20,11 @@
 module Selenium
   module WebDriver
     module Atoms
+      def atom_script(function_name)
+        format("/* #{function_name} */return (%<atom>s).apply(null, arguments)",
+               atom: read_atom(function_name))
+      end
+
       private
 
       def read_atom(function)
@@ -27,9 +32,7 @@ module Selenium
       end
 
       def execute_atom(function_name, *arguments)
-        script = format("/* #{function_name} */return (%<atom>s).apply(null, arguments)",
-                        atom: read_atom(function_name))
-        execute_script(script, *arguments)
+        execute_script(atom_script(function_name), *arguments)
       end
     end # Atoms
   end # WebDriver

data/lib/selenium/webdriver/chrome/driver.rb

@@ -30,8 +30,8 @@ module Selenium
       class Driver < Chromium::Driver
         include LocalDriver
 
-        def initialize(capabilities: nil, options: nil, service: nil, url: nil, **opts)
-          caps, url = initialize_local_driver(capabilities, options, service, url)
+        def initialize(options: nil, service: nil, url: nil, **opts)
+          caps, url = initialize_local_driver(options, service, url)
           super(caps: caps, url: url, **opts)
         end
 

data/lib/selenium/webdriver/chrome/service.rb

@@ -17,15 +17,20 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'selenium/webdriver/chromium/service'
-
 module Selenium
   module WebDriver
     module Chrome
-      class Service < Chromium::Service
+      class Service < WebDriver::Service
         DEFAULT_PORT = 9515
         EXECUTABLE = 'chromedriver'
         SHUTDOWN_SUPPORTED = true
+
+        def log
+          return @log unless @log.is_a? String
+
+          @args << "--log-path=#{@log}"
+          @log = nil
+        end
       end # Service
     end # Chrome
   end # WebDriver

data/lib/selenium/webdriver/chrome.rb

@@ -17,8 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'net/http'
-
 module Selenium
   module WebDriver
     module Chrome

data/lib/selenium/webdriver/chromium/driver.rb

@@ -33,7 +33,6 @@ module Selenium
                       DriverExtensions::HasNetworkInterception,
                       DriverExtensions::HasWebStorage,
                       DriverExtensions::HasLaunching,
-                      DriverExtensions::HasLocation,
                       DriverExtensions::HasPermissions,
                       DriverExtensions::DownloadsFiles,
                       DriverExtensions::HasDevTools,

data/lib/selenium/webdriver/chromium/options.rb

@@ -47,7 +47,7 @@ module Selenium
         #
         # @example
         #   options = Selenium::WebDriver::Chrome::Options.new(args: ['start-maximized', 'user-data-dir=/tmp/temp_profile'])
-        #   driver = Selenium::WebDriver.for(:chrome, capabilities: options)
+        #   driver = Selenium::WebDriver.for(:chrome, options: options)
         #
         # @param [Profile] profile An instance of a Chrome::Profile Class
         # @param [Hash] opts the pre-defined options to create the Chrome::Options with
@@ -159,24 +159,6 @@ module Selenium
           @options[:prefs][name] = value
         end
 
-        #
-        # Run Chrome in headless mode.
-        # Old headless uses a non-production browser and is set with `--headless`
-        # Native headless from v86 - v108 is set with `--headless=chrome`
-        # Native headless from v109+ is set with `--headless=new`
-        #
-        # @example Enable headless mode
-        #   options = Selenium::WebDriver::Chrome::Options.new
-        #   options.headless!
-        #
-
-        def headless!
-          WebDriver.logger.deprecate('`Options#headless!`',
-                                     "`Options#add_argument('--headless=new')`",
-                                     id: :headless)
-          add_argument '--headless'
-        end
-
         #
         # Add emulation device information
         #

data/lib/selenium/webdriver/chromium.rb

@@ -17,8 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'net/http'
-
 module Selenium
   module WebDriver
     module Chromium
@@ -26,7 +24,6 @@ module Selenium
       autoload :Driver, 'selenium/webdriver/chromium/driver'
       autoload :Profile, 'selenium/webdriver/chromium/profile'
       autoload :Options, 'selenium/webdriver/chromium/options'
-      autoload :Service, 'selenium/webdriver/chromium/service'
     end # Chromium
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/action_builder.rb

@@ -33,8 +33,6 @@ module Selenium
       # correctly when using asynchronous.
       #
       # @param [Selenium::WebDriver::Remote::Bridge] bridge the bridge for the current driver instance.
-      # @param [Selenium::WebDriver::Interactions::PointerInput] deprecated_mouse PointerInput for the mouse.
-      # @param [Selenium::WebDriver::Interactions::KeyInput] deprecated_keyboard KeyInput for the keyboard.
       # @param [Boolean] deprecated_async Whether to perform the actions asynchronously per device.
       #   Defaults to false for backwards compatibility.
       # @param [Array<Selenium::WebDriver::Interactions::InputDevices>] devices list of valid sources of input.

data/lib/selenium/webdriver/common/child_process.rb

@@ -81,11 +81,11 @@ module Selenium
       end
 
       def exited?
-        return unless @pid
+        return false unless @pid
 
         WebDriver.logger.debug("Checking if #{@pid} is exited:", id: :process)
         _, @status = Process.waitpid2(@pid, Process::WNOHANG | Process::WUNTRACED) if @status.nil?
-        return if @status.nil?
+        return false if @status.nil?
 
         exit_code = @status.exitstatus || @status.termsig
         WebDriver.logger.debug("  -> exit code is #{exit_code.inspect}", id: :process)

data/lib/selenium/webdriver/common/driver.rb

@@ -318,18 +318,6 @@ module Selenium
         end
       end
 
-      def generate_capabilities(capabilities)
-        Array(capabilities).map { |cap|
-          if cap.is_a? Symbol
-            cap = WebDriver::Options.send(cap)
-          elsif !cap.respond_to? :as_json
-            msg = ":capabilities parameter only accepts objects responding to #as_json which #{cap.class} does not"
-            raise ArgumentError, msg
-          end
-          cap.as_json
-        }.inject(:merge)
-      end
-
       def service_url(service)
         @service_manager = service.launch
         @service_manager.uri

data/lib/selenium/webdriver/common/driver_finder.rb

@@ -23,7 +23,6 @@ module Selenium
       def self.path(options, klass)
         path = klass.driver_path
         path = path.call if path.is_a?(Proc)
-        path ||= Platform.find_binary(klass::EXECUTABLE)
 
         path ||= begin
           SeleniumManager.driver_path(options) unless options.is_a?(Remote::Capabilities)
@@ -32,7 +31,6 @@ module Selenium
         end
 
         begin
-          Platform.assert_file(path)
           Platform.assert_executable(path)
         rescue TypeError
           raise Error::NoSuchDriverError, "Unable to locate or obtain #{klass::EXECUTABLE}"

data/lib/selenium/webdriver/common/local_driver.rb

@@ -20,35 +20,26 @@
 module Selenium
   module WebDriver
     module LocalDriver
-      def initialize_local_driver(capabilities, options, service, url)
+      def initialize_local_driver(options, service, url)
         raise ArgumentError, "Can't initialize #{self.class} with :url" if url
 
         service ||= Service.send(browser)
-        caps = process_options(options, capabilities, service)
+        caps = process_options(options, service)
         url = service_url(service)
 
         [caps, url]
       end
 
-      def process_options(options, capabilities, service)
+      def process_options(options, service)
         default_options = Options.send(browser)
+        options ||= default_options
 
-        if options && capabilities
-          msg = "Don't use both :options and :capabilities when initializing #{self.class}, prefer :options"
-          raise ArgumentError, msg
-        elsif options && !options.is_a?(default_options.class)
+        unless options.is_a?(default_options.class)
           raise ArgumentError, ":options must be an instance of #{default_options.class}"
-        elsif capabilities
-          WebDriver.logger.deprecate("The :capabilities parameter for #{self.class}",
-                                     ":options argument with an instance of #{self.class}",
-                                     id: :capabilities)
-          service.executable_path ||= WebDriver::DriverFinder.path(capabilities, service.class)
-          generate_capabilities(capabilities)
-        else
-          options ||= default_options
-          service.executable_path ||= WebDriver::DriverFinder.path(options, service.class)
-          options.as_json
         end
+
+        service.executable_path ||= WebDriver::DriverFinder.path(options, service.class)
+        options.as_json
       end
     end
   end

data/lib/selenium/webdriver/common/options.rb

@@ -86,12 +86,6 @@ module Selenium
 
       def add_option(name, value = nil)
         name, value = name.first if value.nil? && name.is_a?(Hash)
-
-        unless name.to_s.include?(':')
-          WebDriver.logger.deprecate('Options#add_option for w3c or browser specific capabilities',
-                                     'applicable attribute accessors or pass into constructor',
-                                     id: :add_option)
-        end
         @options[name] = value
       end
 
@@ -113,24 +107,11 @@ module Selenium
         w3c_options = process_w3c_options(options)
 
         browser_options = self.class::CAPABILITIES.each_with_object({}) do |(capability_alias, capability_name), hash|
-          from_name = options.delete(capability_name)
-          from_alias = options.delete(capability_alias)
-          capability_value = if !from_name.nil? && capability_alias != capability_name
-                               WebDriver.logger.deprecate("#{capability_name} as option",
-                                                          capability_alias.to_s, id: :option_symbols)
-                               from_name
-                             elsif !from_alias.nil?
-                               from_alias
-                             end
-
+          capability_value = options.delete(capability_alias)
           hash[capability_name] = capability_value unless capability_value.nil?
         end
 
-        unless options.empty?
-          msg = 'These options are not w3c compliant and will result in failures in a future release'
-          WebDriver.logger.warn("#{msg}: #{options}", id: :w3c_options)
-          browser_options.merge!(options)
-        end
+        raise Error::WebDriverError, "These options are not w3c compliant: #{options}" unless options.empty?
 
         browser_options = {self.class::KEY => browser_options} if defined?(self.class::KEY)
 
@@ -145,7 +126,7 @@ module Selenium
       end
 
       def process_w3c_options(options)
-        w3c_options = options.select { |key, _val| w3c?(key) }
+        w3c_options = options.select { |key, val| w3c?(key) && !val.nil? }
         w3c_options[:unhandled_prompt_behavior] &&= w3c_options[:unhandled_prompt_behavior]&.to_s&.tr('_', ' ')
         options.delete_if { |key, _val| w3c?(key) }
         w3c_options

data/lib/selenium/webdriver/common/platform.rb

@@ -62,18 +62,6 @@ module Selenium
         end
       end
 
-      def bitsize
-        @bitsize ||= if defined?(FFI::Platform::ADDRESS_SIZE)
-                       FFI::Platform::ADDRESS_SIZE
-                     elsif defined?(FFI)
-                       FFI.type_size(:pointer) == 4 ? 32 : 64
-                     elsif jruby?
-                       Integer(ENV_JAVA['sun.arch.data.model'])
-                     else
-                       1.size == 4 ? 32 : 64
-                     end
-      end
-
       def jruby?
         engine == :jruby
       end
@@ -158,43 +146,6 @@ module Selenium
         at_exit { yield if Process.pid == pid }
       end
 
-      def find_binary(*binary_names)
-        paths = ENV['PATH'].split(File::PATH_SEPARATOR)
-
-        if windows?
-          binary_names.map! { |n| "#{n}.exe" }
-          binary_names.dup.each { |n| binary_names << n.gsub('exe', 'bat') }
-        end
-
-        binary_names.each do |binary_name|
-          paths.each do |path|
-            full_path = File.join(path, binary_name)
-            full_path = unix_path(full_path) if windows?
-            exe = Dir.glob(full_path).find { |f| File.executable?(f) }
-            return exe if exe
-          end
-        end
-
-        nil
-      end
-
-      def find_in_program_files(*binary_names)
-        paths = [
-          ENV.fetch('PROGRAMFILES', '\\Program Files'),
-          ENV.fetch('ProgramFiles(x86)', '\\Program Files (x86)'),
-          ENV.fetch('ProgramW6432', '\\Program Files')
-        ]
-
-        paths.each do |root|
-          binary_names.each do |name|
-            exe = File.join(root, name)
-            return exe if File.executable?(exe)
-          end
-        end
-
-        nil
-      end
-
       def localhost
         info = Socket.getaddrinfo 'localhost', 80, Socket::AF_INET, Socket::SOCK_STREAM
 

data/lib/selenium/webdriver/common/selenium_manager.rb

@@ -37,22 +37,26 @@ module Selenium
         # @param [Options] options browser options.
         # @return [String] the path to the correct driver.
         def driver_path(options)
-          message = 'applicable driver not found; attempting to install with Selenium Manager (Beta)'
-          WebDriver.logger.debug(message, id: :selenium_manager)
-
           command = generate_command(binary, options)
 
-          location = run(*command)
-          WebDriver.logger.debug("Driver found at #{location}", id: :selenium_manager)
-          Platform.assert_executable location
+          output = run(*command)
+
+          browser_path = output['browser_path']
+          driver_path = output['driver_path']
+          Platform.assert_executable driver_path
+
+          if options.respond_to? :binary
+            options.binary = browser_path
+            options.browser_version = nil
+          end
 
-          location
+          driver_path
         end
 
         private
 
         def generate_command(binary, options)
-          command = [binary, '--browser', options.browser_name, '--output', 'json']
+          command = [binary, '--browser', options.browser_name]
           if options.browser_version
             command << '--browser-version'
             command << options.browser_version
@@ -65,59 +69,64 @@ module Selenium
             command << '--proxy'
             (command << options.proxy.ssl) || options.proxy.http
           end
-          command << '--debug' if WebDriver.logger.debug?
           command
         end
 
         # @return [String] the path to the correct selenium manager
         def binary
           @binary ||= begin
-            path = File.expand_path(bin_path, __FILE__)
-            path << if Platform.windows?
-                      '/windows/selenium-manager.exe'
-                    elsif Platform.mac?
-                      '/macos/selenium-manager'
-                    elsif Platform.linux?
-                      '/linux/selenium-manager'
-                    end
-            location = File.expand_path(path, __FILE__)
-
-            begin
-              Platform.assert_file(location)
-              Platform.assert_executable(location)
-            rescue TypeError
-              raise Error::WebDriverError,
-                    "Unable to locate or obtain Selenium Manager binary; #{location} is not a valid file object"
-            rescue Error::WebDriverError => e
-              raise Error::WebDriverError, "Selenium Manager binary located, but #{e.message}"
-            end
-
-            WebDriver.logger.debug("Selenium Manager binary found at #{location}", id: :selenium_manager)
+            location = ENV.fetch('SE_MANAGER_PATH', begin
+              directory = File.expand_path(bin_path, __FILE__)
+              if Platform.windows?
+                "#{directory}/windows/selenium-manager.exe"
+              elsif Platform.mac?
+                "#{directory}/macos/selenium-manager"
+              elsif Platform.linux?
+                "#{directory}/linux/selenium-manager"
+              end
+            end)
+
+            validate_location(location)
             location
           end
         end
 
+        def validate_location(location)
+          begin
+            Platform.assert_file(location)
+            Platform.assert_executable(location)
+          rescue TypeError
+            raise Error::WebDriverError,
+                  "Unable to locate or obtain Selenium Manager binary; #{location} is not a valid file object"
+          rescue Error::WebDriverError => e
+            raise Error::WebDriverError, "Selenium Manager binary located, but #{e.message}"
+          end
+
+          WebDriver.logger.debug("Selenium Manager binary found at #{location}", id: :selenium_manager)
+        end
+
         def run(*command)
+          command += %w[--output json]
+          command << '--debug' if WebDriver.logger.debug?
+
           WebDriver.logger.debug("Executing Process #{command}", id: :selenium_manager)
 
           begin
             stdout, stderr, status = Open3.capture3(*command)
-            json_output = stdout.empty? ? nil : JSON.parse(stdout)
-            result = json_output&.dig('result', 'message')
           rescue StandardError => e
             raise Error::WebDriverError, "Unsuccessful command executed: #{command}; #{e.message}"
           end
 
-          (json_output&.fetch('logs') || []).each do |log|
+          json_output = stdout.empty? ? {} : JSON.parse(stdout)
+          (json_output['logs'] || []).each do |log|
             level = log['level'].casecmp('info').zero? ? 'debug' : log['level'].downcase
             WebDriver.logger.send(level, log['message'], id: :selenium_manager)
           end
 
-          if status.exitstatus.positive?
-            raise Error::WebDriverError, "Unsuccessful command executed: #{command}\n#{result}#{stderr}"
-          end
+          result = json_output['result']
+          return result unless status.exitstatus.positive?
 
-          result
+          raise Error::WebDriverError, "Unsuccessful command executed: #{command}\n#{result}#{stderr}"
         end
       end
     end # SeleniumManager

data/lib/selenium/webdriver/common/service.rb

@@ -81,28 +81,22 @@ module Selenium
                else
                  log
                end
-
-        @args = args.is_a?(Hash) ? extract_service_args(args) : args
+        @args = args
 
         raise Error::WebDriverError, "invalid port: #{@port}" if @port < 1
       end
 
       def launch
+        @executable_path ||= begin
+          default_options = WebDriver.const_get("#{self.class.name.split('::')[2]}::Options").new
+          DriverFinder.path(default_options, self.class)
+        end
         ServiceManager.new(self).tap(&:start)
       end
 
       def shutdown_supported
         self.class::SHUTDOWN_SUPPORTED
       end
-
-      protected
-
-      def extract_service_args(driver_opts)
-        WebDriver.logger.deprecate('initializing Service class with :args using Hash',
-                                   ':args parameter with an Array of String values',
-                                   id: :driver_opts)
-        driver_opts.key?(:args) ? driver_opts.delete(:args) : []
-      end
     end # Service
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/service_manager.rb

@@ -40,8 +40,8 @@ module Selenium
         @executable_path = config.executable_path
         @host = Platform.localhost
         @port = config.port
-        @extra_args = config.args
         @io = config.log
+        @extra_args = config.args
         @shutdown_supported = config.shutdown_supported
 
         raise Error::WebDriverError, "invalid port: #{@port}" if @port < 1

data/lib/selenium/webdriver/common/websocket_connection.rb

@@ -129,7 +129,7 @@ module Selenium
           Thread.current.report_on_exception = true
 
           yield params
-        rescue *CONNECTION_ERRORS
+        rescue Error::WebDriverError, *CONNECTION_ERRORS
           Thread.stop
         end
       end

data/lib/selenium/webdriver/common.rb

@@ -68,10 +68,8 @@ require 'selenium/webdriver/common/html5/local_storage'
 require 'selenium/webdriver/common/html5/session_storage'
 require 'selenium/webdriver/common/driver_extensions/has_web_storage'
 require 'selenium/webdriver/common/driver_extensions/downloads_files'
-require 'selenium/webdriver/common/driver_extensions/has_location'
 require 'selenium/webdriver/common/driver_extensions/has_session_id'
 require 'selenium/webdriver/common/driver_extensions/has_network_conditions'
-require 'selenium/webdriver/common/driver_extensions/has_network_connection'
 require 'selenium/webdriver/common/driver_extensions/has_network_interception'
 require 'selenium/webdriver/common/driver_extensions/has_apple_permissions'
 require 'selenium/webdriver/common/driver_extensions/has_permissions'

data/lib/selenium/webdriver/edge/driver.rb

@@ -30,8 +30,8 @@ module Selenium
       class Driver < Chromium::Driver
         include LocalDriver
 
-        def initialize(capabilities: nil, options: nil, service: nil, url: nil, **opts)
-          caps, url = initialize_local_driver(capabilities, options, service, url)
+        def initialize(options: nil, service: nil, url: nil, **opts)
+          caps, url = initialize_local_driver(options, service, url)
           super(caps: caps, url: url, **opts)
         end
 

data/lib/selenium/webdriver/edge/service.rb

@@ -17,15 +17,20 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'selenium/webdriver/chromium/service'
-
 module Selenium
   module WebDriver
     module Edge
-      class Service < Chromium::Service
+      class Service < WebDriver::Service
         DEFAULT_PORT = 9515
         EXECUTABLE = 'msedgedriver'
         SHUTDOWN_SUPPORTED = true
+
+        def log
+          return @log unless @log.is_a? String
+
+          @args << "--log-path=#{@log}"
+          @log = nil
+        end
       end # Service
     end # Edge
   end # WebDriver

data/lib/selenium/webdriver/edge.rb

@@ -17,8 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'net/http'
-
 module Selenium
   module WebDriver
     module Edge

data/lib/selenium/webdriver/firefox/driver.rb

@@ -38,8 +38,8 @@ module Selenium
 
         include LocalDriver
 
-        def initialize(capabilities: nil, options: nil, service: nil, url: nil, **opts)
-          caps, url = initialize_local_driver(capabilities, options, service, url)
+        def initialize(options: nil, service: nil, url: nil, **opts)
+          caps, url = initialize_local_driver(options, service, url)
           super(caps: caps, url: url, **opts)
         end
 

data/lib/selenium/webdriver/firefox/options.rb

@@ -45,7 +45,7 @@ module Selenium
         #
         # @example
         #   options = Selenium::WebDriver::Firefox::Options.new(args: ['--host=127.0.0.1'])
-        #   driver = Selenium::WebDriver.for :firefox, capabilities: options
+        #   driver = Selenium::WebDriver.for :firefox, options: options
         #
         # @param [Hash] opts the pre-defined options to create the Firefox::Options with
         # @option opts [String] :binary Path to the Firefox executable to use
@@ -99,21 +99,6 @@ module Selenium
           @options[:prefs][name] = value
         end
 
-        #
-        # Run Firefox in headless mode.
-        #
-        # @example Enable headless mode
-        #   options = Selenium::WebDriver::Firefox::Options.new
-        #   options.headless!
-        #
-
-        def headless!
-          WebDriver.logger.deprecate('`Options#headless!`',
-                                     "`Options#add_argument('-headless')`",
-                                     id: :headless)
-          add_argument '-headless'
-        end
-
         #
         # Sets Firefox profile.
         #

data/lib/selenium/webdriver/firefox/service.rb

@@ -24,18 +24,6 @@ module Selenium
         DEFAULT_PORT = 4444
         EXECUTABLE = 'geckodriver'
         SHUTDOWN_SUPPORTED = false
-
-        private
-
-        def extract_service_args(driver_opts)
-          driver_args = super
-          driver_opts = driver_opts.dup
-          driver_args << "--binary=#{driver_opts[:binary]}" if driver_opts.key?(:binary)
-          driver_args << "--log=#{driver_opts[:log]}" if driver_opts.key?(:log)
-          driver_args << "--marionette-port=#{driver_opts[:marionette_port]}" if driver_opts.key?(:marionette_port)
-          driver_args << "--host=#{driver_opts[:host]}" if driver_opts.key?(:host)
-          driver_args
-        end
       end # Service
     end # Firefox
   end # WebDriver

data/lib/selenium/webdriver/ie/driver.rb

@@ -31,8 +31,8 @@ module Selenium
 
         include LocalDriver
 
-        def initialize(capabilities: nil, options: nil, service: nil, url: nil, **opts)
-          caps, url = initialize_local_driver(capabilities, options, service, url)
+        def initialize(options: nil, service: nil, url: nil, **opts)
+          caps, url = initialize_local_driver(options, service, url)
           super(caps: caps, url: url, **opts)
         end
 

data/lib/selenium/webdriver/ie/options.rb

@@ -41,7 +41,8 @@ module Selenium
           use_per_process_proxy: 'ie.usePerProcessProxy',
           use_legacy_file_upload_dialog_handling: 'ie.useLegacyFileUploadDialogHandling',
           attach_to_edge_chrome: 'ie.edgechromium',
-          edge_executable_path: 'ie.edgepath'
+          edge_executable_path: 'ie.edgepath',
+          ignore_process_match: 'ie.ignoreprocessmatch'
         }.freeze
         BROWSER = 'internet explorer'
 
@@ -52,12 +53,12 @@ module Selenium
         #
         # @example
         #   options = Selenium::WebDriver::IE::Options.new(args: ['--host=127.0.0.1'])
-        #   driver = Selenium::WebDriver.for(:ie, capabilities: options)
+        #   driver = Selenium::WebDriver.for(:ie, options: options)
         #
         # @example
         #   options = Selenium::WebDriver::IE::Options.new
         #   options.element_scroll_behavior = Selenium::WebDriver::IE::Options::SCROLL_BOTTOM
-        #   driver = Selenium::WebDriver.for(:ie, capabilities: options)
+        #   driver = Selenium::WebDriver.for(:ie, options: options)
         #
         # @param [Hash] opts the pre-defined options
         # @option opts [Array<String>] args

data/lib/selenium/webdriver/ie/service.rb

@@ -24,22 +24,6 @@ module Selenium
         DEFAULT_PORT = 5555
         EXECUTABLE = 'IEDriverServer'
         SHUTDOWN_SUPPORTED = true
-
-        private
-
-        def extract_service_args(driver_opts)
-          driver_args = super
-          driver_opts = driver_opts.dup
-          driver_args << "--log-level=#{driver_opts[:log_level].to_s.upcase}" if driver_opts.key?(:log_level)
-          driver_args << "--log-file=#{driver_opts[:log_file]}" if driver_opts.key?(:log_file)
-          if driver_opts.key?(:implementation)
-            driver_args << "--implementation=#{driver_opts[:implementation].to_s.upcase}"
-          end
-          driver_args << "--host=#{driver_opts[:host]}" if driver_opts.key?(:host)
-          driver_args << "--extract_path=#{driver_opts[:extract_path]}" if driver_opts.key?(:extract_path)
-          driver_args << '--silent' if driver_opts[:silent] == true
-          driver_args
-        end
       end # Server
     end # IE
   end # WebDriver

data/lib/selenium/webdriver/remote/capabilities.rb

@@ -53,83 +53,11 @@ module Selenium
           end
         end
 
-        #
-        # Backward compatibility
-        #
-
-        def version
-          WebDriver.logger.deprecate('`Capabilities#version`', '`Capabilities#browser_version`', id: :jwp_caps)
-          browser_version
-        end
-
-        def version=(value)
-          WebDriver.logger.deprecate('`Capabilities#version=`', '`Capabilities#browser_version=`', id: :jwp_caps)
-          self.browser_version = value
-        end
-
-        def platform
-          WebDriver.logger.deprecate('`Capabilities#platform`', '`Capabilities#platform_name`', id: :jwp_caps)
-          platform_name
-        end
-
-        def platform=(value)
-          WebDriver.logger.deprecate('`Capabilities#platform=`', '`Capabilities#platform_name=`', id: :jwp_caps)
-          self.platform_name = value
-        end
-
         #
         # Convenience methods for the common choices.
         #
 
         class << self
-          def chrome(opts = {})
-            WebDriver.logger.deprecate('Remote::Capabilities.chrome', 'Options.chrome', id: :caps_browsers)
-            new({
-              browser_name: 'chrome'
-            }.merge(opts))
-          end
-
-          def edge(opts = {})
-            WebDriver.logger.deprecate('Remote::Capabilities.edge', 'Options.edge', id: :caps_browsers)
-            new({
-              browser_name: 'MicrosoftEdge'
-            }.merge(opts))
-          end
-          alias microsoftedge edge
-
-          def firefox(opts = {})
-            WebDriver.logger.deprecate('Remote::Capabilities.firefox', 'Options.firefox', id: :caps_browsers)
-            new({
-              browser_name: 'firefox'
-            }.merge(opts))
-          end
-          alias ff firefox
-
-          def safari(opts = {})
-            WebDriver.logger.deprecate('Remote::Capabilities.safari', 'Options.safari', id: :caps_browsers)
-            new({
-              browser_name: Selenium::WebDriver::Safari.technology_preview? ? 'Safari Technology Preview' : 'safari'
-            }.merge(opts))
-          end
-
-          def htmlunit(opts = {})
-            WebDriver.logger.deprecate('Remote::Capabilities.htmlunit',
-                                       'as argument in constructor',
-                                       id: :caps_browsers)
-            new({
-              browser_name: 'htmlunit'
-            }.merge(opts))
-          end
-
-          def internet_explorer(opts = {})
-            WebDriver.logger.deprecate('Remote::Capabilities.ie', 'Options.ie', id: :caps_browsers)
-            new({
-              browser_name: 'internet explorer',
-              platform_name: :windows
-            }.merge(opts))
-          end
-          alias ie internet_explorer
-
           def always_match(capabilities)
             new(always_match: capabilities)
           end

data/lib/selenium/webdriver/remote/driver.rb

@@ -60,6 +60,18 @@ module Selenium
           end
           options ? options.as_json : generate_capabilities(capabilities)
         end
+
+        def generate_capabilities(capabilities)
+          Array(capabilities).map { |cap|
+            if cap.is_a? Symbol
+              cap = WebDriver::Options.send(cap)
+            elsif !cap.respond_to? :as_json
+              msg = ":capabilities parameter only accepts objects responding to #as_json which #{cap.class} does not"
+              raise ArgumentError, msg
+            end
+            cap.as_json
+          }.inject(:merge)
+        end
       end # Driver
     end # Remote
   end # WebDriver

data/lib/selenium/webdriver/remote/http/default.rb

@@ -16,8 +16,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
-require 'net/https'
 require 'ipaddr'
 
 module Selenium
@@ -96,6 +94,7 @@ module Selenium
             end
 
             if response.is_a? Net::HTTPRedirection
+              WebDriver.logger.debug("Redirect to #{response['Location']}; times: #{redirects}")
               raise Error::WebDriverError, 'too many redirects' if redirects >= MAX_REDIRECTS
 
               request(:get, URI.parse(response['Location']), DEFAULT_HEADERS.dup, nil, redirects + 1)

data/lib/selenium/webdriver/remote/server_error.rb

@@ -25,7 +25,7 @@ module Selenium
           if response.is_a? String
             super(response)
           else
-            super("status code #{response.code}")
+            super("status code #{response.code}; payload #{response.payload}")
           end
         end
       end # ServerError

data/lib/selenium/webdriver/safari/driver.rb

@@ -32,8 +32,8 @@ module Selenium
 
         include LocalDriver
 
-        def initialize(capabilities: nil, options: nil, service: nil, url: nil, **opts)
-          caps, url = initialize_local_driver(capabilities, options, service, url)
+        def initialize(options: nil, service: nil, url: nil, **opts)
+          caps, url = initialize_local_driver(options, service, url)
           super(caps: caps, url: url, **opts)
         end
 

data/lib/selenium/webdriver/version.rb

@@ -19,6 +19,6 @@
 
 module Selenium
   module WebDriver
-    VERSION = '4.10.0'
+    VERSION = '4.14.0'
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver.rb

@@ -23,6 +23,7 @@ require 'date'
 require 'json'
 require 'set'
 require 'uri'
+require 'net/http'
 
 require 'selenium/webdriver/atoms'
 require 'selenium/webdriver/common'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.14.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -242,7 +242,6 @@ files:
 - lib/selenium/webdriver/chromium/features.rb
 - lib/selenium/webdriver/chromium/options.rb
 - lib/selenium/webdriver/chromium/profile.rb
-- lib/selenium/webdriver/chromium/service.rb
 - lib/selenium/webdriver/common.rb
 - lib/selenium/webdriver/common/action_builder.rb
 - lib/selenium/webdriver/common/alert.rb
@@ -260,11 +259,9 @@ files:
 - lib/selenium/webdriver/common/driver_extensions/has_debugger.rb
 - lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
 - lib/selenium/webdriver/common/driver_extensions/has_launching.rb
-- lib/selenium/webdriver/common/driver_extensions/has_location.rb
 - lib/selenium/webdriver/common/driver_extensions/has_log_events.rb
 - lib/selenium/webdriver/common/driver_extensions/has_logs.rb
 - lib/selenium/webdriver/common/driver_extensions/has_network_conditions.rb
-- lib/selenium/webdriver/common/driver_extensions/has_network_connection.rb
 - lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb
 - lib/selenium/webdriver/common/driver_extensions/has_permissions.rb
 - lib/selenium/webdriver/common/driver_extensions/has_pinned_scripts.rb

data/lib/selenium/webdriver/chromium/service.rb

@@ -1,42 +0,0 @@
-# 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.
-
-module Selenium
-  module WebDriver
-    module Chromium
-      class Service < WebDriver::Service
-        protected
-
-        def extract_service_args(driver_opts)
-          driver_args = super
-          driver_opts = driver_opts.dup
-          driver_args << "--log-path=#{driver_opts.delete(:log_path)}" if driver_opts.key?(:log_path)
-          driver_args << "--url-base=#{driver_opts.delete(:url_base)}" if driver_opts.key?(:url_base)
-          driver_args << "--port-server=#{driver_opts.delete(:port_server)}" if driver_opts.key?(:port_server)
-          if driver_opts.key?(:whitelisted_ips)
-            driver_args << "--whitelisted-ips=#{driver_opts.delete(:whitelisted_ips)}"
-          end
-          driver_args << '--verbose' if driver_opts.key?(:verbose)
-          driver_args << '--silent' if driver_opts.key?(:silent)
-          driver_args
-        end
-      end # Service
-    end # Chromium
-  end # WebDriver
-end # Selenium

data/lib/selenium/webdriver/common/driver_extensions/has_location.rb

@@ -1,36 +0,0 @@
-# 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.
-
-# TODO: Deprecated; Delete after 4.0 release
-module Selenium
-  module WebDriver
-    module DriverExtensions
-      module HasLocation
-        def location
-          raise Error::UnsupportedOperationError, 'The W3C standard does not currently support getting location'
-        end
-
-        def location=(*)
-          raise Error::UnsupportedOperationError, 'The W3C standard does not currently support setting location'
-        end
-        alias set_location location
-      end # HasLocation
-    end # DriverExtensions
-  end # WebDriver
-end # Selenium

data/lib/selenium/webdriver/common/driver_extensions/has_network_connection.rb

@@ -1,37 +0,0 @@
-# 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.
-
-# TODO: Deprecated; Delete after 4.0 release
-module Selenium
-  module WebDriver
-    module DriverExtensions
-      module HasNetworkConnection
-        def network_connection_type
-          raise Error::UnsupportedOperationError,
-                'The W3C standard does not currently support getting network connection'
-        end
-
-        def network_connection_type=(*)
-          raise Error::UnsupportedOperationError,
-                'The W3C standard does not currently support setting network connection'
-        end
-      end # HasNetworkConnection
-    end # DriverExtensions
-  end # WebDriver
-end # Selenium