selenium-webdriver 3.141.0 → 3.142.7

data/lib/selenium/webdriver/ie.rb

@@ -1,3 +1,5 @@
+# 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
@@ -17,19 +19,23 @@
 
 require 'selenium/webdriver/ie/driver'
 require 'selenium/webdriver/ie/options'
-require 'selenium/webdriver/ie/service'
 
 module Selenium
   module WebDriver
     module IE
       def self.driver_path=(path)
-        Platform.assert_executable path
-        @driver_path = path
+        WebDriver.logger.deprecate 'Selenium::WebDriver::IE#driver_path=',
+                                   'Selenium::WebDriver::IE::Service#driver_path='
+        Selenium::WebDriver::IE::Service.driver_path = path
       end
 
       def self.driver_path
-        @driver_path ||= nil
+        WebDriver.logger.deprecate 'Selenium::WebDriver::IE#driver_path',
+                                   'Selenium::WebDriver::IE::Service#driver_path'
+        Selenium::WebDriver::IE::Service.driver_path
       end
     end # IE
   end # WebDriver
 end # Selenium
+
+require 'selenium/webdriver/ie/service'

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

@@ -1,3 +1,5 @@
+# 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
@@ -24,7 +26,7 @@ module Selenium
 
         PORT = 4444
         COMMANDS = {
-          new_session: [:post, 'session'.freeze]
+          new_session: [:post, 'session']
         }.freeze
 
         attr_accessor :context, :http, :file_detector
@@ -46,6 +48,7 @@ module Selenium
             unless Capabilities.respond_to?(desired_capabilities)
               raise Error::WebDriverError, "invalid desired capability: #{desired_capabilities.inspect}"
             end
+
             desired_capabilities = Capabilities.__send__(desired_capabilities)
           end
 
@@ -54,9 +57,9 @@ module Selenium
 
           case bridge.dialect
           when :oss
-            Remote::OSS::Bridge.new(capabilities, bridge.session_id, opts)
+            Remote::OSS::Bridge.new(capabilities, bridge.session_id, **opts)
           when :w3c
-            Remote::W3C::Bridge.new(capabilities, bridge.session_id, opts)
+            Remote::W3C::Bridge.new(capabilities, bridge.session_id, **opts)
           else
             raise WebDriverError, 'cannot understand dialect'
           end
@@ -112,9 +115,7 @@ module Selenium
             end
           end
 
-          unless @session_id
-            raise Error::WebDriverError, 'no sessionId in returned payload'
-          end
+          raise Error::WebDriverError, 'no sessionId in returned payload' unless @session_id
 
           if oss_status
             WebDriver.logger.info 'Detected OSS dialect.'
@@ -172,6 +173,7 @@ module Selenium
 
         def commands(command)
           raise NotImplementedError unless command == :new_session
+
           COMMANDS[command]
         end
 

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

@@ -1,3 +1,5 @@
+# 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
@@ -44,6 +46,7 @@ module Selenium
           end
 
           next if key == :proxy
+
           define_method "#{key}=" do |value|
             @capabilities[key] = value
           end
@@ -80,14 +83,21 @@ module Selenium
           def edge(opts = {})
             new({
               browser_name: 'MicrosoftEdge',
-              platform: :windows,
-              javascript_enabled: true,
-              takes_screenshot: true,
-              css_selectors_enabled: true
+              platform: :windows
             }.merge(opts))
           end
 
           def firefox(opts = {})
+            opts[:browser_version] = opts.delete(:version) if opts.key?(:version)
+            opts[:platform_name] = opts.delete(:platform) if opts.key?(:platform)
+            opts[:timeouts] = {}
+            opts[:timeouts]['implicit'] = opts.delete(:implicit_timeout) if opts.key?(:implicit_timeout)
+            opts[:timeouts]['pageLoad'] = opts.delete(:page_load_timeout) if opts.key?(:page_load_timeout)
+            opts[:timeouts]['script'] = opts.delete(:script_timeout) if opts.key?(:script_timeout)
+            new({browser_name: 'firefox', marionette: true}.merge(opts))
+          end
+
+          def firefox_legacy(opts = {})
             new({
               browser_name: 'firefox',
               javascript_enabled: true,
@@ -175,10 +185,6 @@ module Selenium
         # @option :native_events          [Boolean] does this driver use native events?
         # @option :proxy                  [Selenium::WebDriver::Proxy, Hash] proxy configuration
         #
-        # Firefox-specific options:
-        #
-        # @option :firefox_profile        [Selenium::WebDriver::Firefox::Profile] the firefox profile to use
-        #
         # @api public
         #
 
@@ -224,7 +230,7 @@ module Selenium
         # @api private
         #
 
-        def as_json(*)
+        def as_json(*) # rubocop:disable Metrics/CyclomaticComplexity
           hash = {}
 
           @capabilities.each do |key, value|
@@ -232,10 +238,16 @@ module Selenium
             when :platform
               hash['platform'] = value.to_s.upcase
             when :firefox_profile
-              hash['firefox_profile'] = value.as_json['zip'] if value
+              if value
+                WebDriver.logger.deprecate(':firefox_profile capabilitiy', 'Selenium::WebDriver::Firefox::Options#profile')
+                hash['firefox_profile'] = value.as_json['zip']
+              end
             when :proxy
               hash['proxy'] = value.as_json if value
             when String, :firefox_binary
+              if key == :firefox_binary && value
+                WebDriver.logger.deprecate(':firefox_binary capabilitiy', 'Selenium::WebDriver::Firefox::Options#binary')
+              end
               hash[key.to_s] = value
             when Symbol
               hash[camel_case(key.to_s)] = value
@@ -253,6 +265,7 @@ module Selenium
 
         def ==(other)
           return false unless other.is_a? self.class
+
           as_json == other.as_json
         end
         alias_method :eql?, :==

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

@@ -1,3 +1,5 @@
+# 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

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

@@ -1,3 +1,5 @@
+# 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
@@ -21,7 +23,7 @@ module Selenium
       module Http
         class Common
           MAX_REDIRECTS   = 20 # same as chromium/gecko
-          CONTENT_TYPE    = 'application/json'.freeze
+          CONTENT_TYPE    = 'application/json'
           DEFAULT_HEADERS = {
             'Accept' => CONTENT_TYPE,
             'Content-Type' => "#{CONTENT_TYPE}; charset=UTF-8",
@@ -50,7 +52,7 @@ module Selenium
 
             if command_hash
               payload                   = JSON.generate(command_hash)
-              headers['Content-Length'] = payload.bytesize.to_s if [:post, :put].include?(verb)
+              headers['Content-Length'] = payload.bytesize.to_s if %i[post put].include?(verb)
 
               WebDriver.logger.info("   >>> #{url} | #{payload}")
               WebDriver.logger.debug("     > #{headers.inspect}")
@@ -66,6 +68,7 @@ module Selenium
 
           def server_url
             return @server_url if @server_url
+
             raise Error::WebDriverError, 'server_url not set'
           end
 
@@ -81,12 +84,16 @@ module Selenium
 
             if content_type.include? CONTENT_TYPE
               raise Error::WebDriverError, "empty body: #{content_type.inspect} (#{code})\n#{body}" if body.empty?
+
               Response.new(code, JSON.parse(body))
             elsif code == 204
               Response.new(code)
             else
-              msg = "unexpected response, code=#{code}, content-type=#{content_type.inspect}"
-              msg << "\n#{body}" unless body.empty?
+              msg = if body.empty?
+                      "unexpected response, code=#{code}, content-type=#{content_type.inspect}"
+                    else
+                      "unexpected response, code=#{code}, content-type=#{content_type.inspect}\n#{body}"
+                    end
 
               raise Error::WebDriverError, msg
             end

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

@@ -1,3 +1,5 @@
+# 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
@@ -77,7 +79,7 @@ module Selenium
           end
 
           def client
-            @client ||= (
+            @client ||= begin
               c = Curl::Easy.new
 
               c.max_redirects   = MAX_REDIRECTS
@@ -86,7 +88,7 @@ module Selenium
               c.verbose         = WebDriver.logger.info?
 
               c
-            )
+            end
           end
         end # Curb
       end # Http

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

@@ -1,3 +1,5 @@
+# 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
@@ -48,22 +50,26 @@ module Selenium
             self.read_timeout = value
           end
 
+          def close
+            @http&.finish
+          end
+
           private
 
           def http
-            @http ||= (
-            http = new_http_client
-            if server_url.scheme == 'https'
-              http.use_ssl = true
-              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            end
+            @http ||= begin
+              http = new_http_client
+              if server_url.scheme == 'https'
+                http.use_ssl = true
+                http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+              end
 
-            # Defaulting open_timeout to nil to be consistent with Ruby 2.2 and earlier.
-            http.open_timeout = self.open_timeout
-            http.read_timeout = self.read_timeout if self.read_timeout
+              # Defaulting open_timeout to nil to be consistent with Ruby 2.2 and earlier.
+              http.open_timeout = open_timeout
+              http.read_timeout = read_timeout if read_timeout
 
-            http
-            )
+              http.start
+            end
           end
 
           MAX_RETRIES = 3
@@ -83,22 +89,26 @@ module Selenium
               #
               # http://msdn.microsoft.com/en-us/library/aa560610%28v=bts.20%29.aspx
               raise if retries >= MAX_RETRIES
+
               retries += 1
               sleep 2
               retry
             rescue Errno::EADDRNOTAVAIL => ex
               # a retry is sometimes needed when the port becomes temporarily unavailable
               raise if retries >= MAX_RETRIES
+
               retries += 1
               sleep 2
               retry
             rescue Errno::ECONNREFUSED => ex
               raise ex.class, "using proxy: #{proxy.http}" if use_proxy?
+
               raise
             end
 
             if response.is_a? Net::HTTPRedirection
               raise Error::WebDriverError, 'too many redirects' if redirects >= MAX_REDIRECTS
+
               request(:get, URI.parse(response['Location']), DEFAULT_HEADERS.dup, nil, redirects + 1)
             else
               create_response response.code, response.body, response.content_type
@@ -108,9 +118,7 @@ module Selenium
           def new_request_for(verb, url, headers, payload)
             req = Net::HTTP.const_get(verb.to_s.capitalize).new(url.path, headers)
 
-            if server_url.userinfo
-              req.basic_auth server_url.user, server_url.password
-            end
+            req.basic_auth server_url.user, server_url.password if server_url.userinfo
 
             req.body = payload if payload
 
@@ -124,9 +132,7 @@ module Selenium
           def new_http_client
             if use_proxy?
               url = @proxy.http
-              unless proxy.respond_to?(:http) && url
-                raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}"
-              end
+              raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}" unless proxy.respond_to?(:http) && url
 
               proxy = URI.parse(url)
 
@@ -138,15 +144,15 @@ module Selenium
           end
 
           def proxy
-            @proxy ||= (
-            proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-            no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
+            @proxy ||= begin
+              proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+              no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
 
-            if proxy
-              proxy = "http://#{proxy}" unless proxy.start_with?('http://')
-              Proxy.new(http: proxy, no_proxy: no_proxy)
+              if proxy
+                proxy = "http://#{proxy}" unless proxy.start_with?('http://')
+                Proxy.new(http: proxy, no_proxy: no_proxy)
+              end
             end
-            )
           end
 
           def use_proxy?
@@ -161,7 +167,7 @@ module Selenium
                 rescue ArgumentError
                   false
                 end
-                  )
+              )
               end
 
               !ignored

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

@@ -1,3 +1,5 @@
+# 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
@@ -24,7 +26,7 @@ module Selenium
         # @api private
         class Persistent < Default
           def close
-            @http.shutdown if @http
+            @http&.shutdown
           end
 
           private

data/lib/selenium/webdriver/remote/oss/bridge.rb

@@ -1,3 +1,5 @@
+# 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
@@ -279,8 +281,8 @@ module Selenium
           # cookies
           #
 
-          def options
-            @options ||= WebDriver::Options.new(self)
+          def manage
+            @manage ||= WebDriver::Manager.new(self)
           end
 
           def add_cookie(cookie)
@@ -571,6 +573,7 @@ module Selenium
 
           def assert_javascript_enabled
             return if capabilities.javascript_enabled?
+
             raise Error::UnsupportedOperationError, 'underlying webdriver instance does not support javascript'
           end