selenium-webdriver 3.142.7 → 4.0.0.alpha1

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

@@ -41,15 +41,6 @@ module Selenium
             @read_timeout = read_timeout
           end
 
-          # Maintaining backward compatibility.
-          # @param [Numeric] value - Timeout in seconds to apply to both open timeout and read timeouts.
-          # @deprecated Please set the specific desired timeout {#read_timeout} or {#open_timeout} directly.
-          def timeout=(value)
-            WebDriver.logger.deprecate ':timeout=', '#read_timeout= and #open_timeout='
-            self.open_timeout = value
-            self.read_timeout = value
-          end
-
           def close
             @http&.finish
           end

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

@@ -20,12 +20,13 @@
 module Selenium
   module WebDriver
     module Remote
+
+      #
       # @api private
-      class Response
-        STACKTRACE_KEY = 'stackTrace'
+      #
 
+      class Response
         attr_reader :code, :payload
-        attr_writer :payload
 
         def initialize(code, payload = nil)
           @code    = code
@@ -35,33 +36,16 @@ module Selenium
         end
 
         def error
-          klass = Error.for_code(status) || return
+          error, message, backtrace = process_error
+          klass = Error.for_error(error) || return
 
-          ex = klass.new(error_message)
+          ex = klass.new(message)
           ex.set_backtrace(caller)
-          add_backtrace ex
+          add_backtrace ex, backtrace
 
           ex
         end
 
-        def error_message
-          val = value
-
-          case val
-          when Hash
-            msg = val['message']
-            return 'unknown error' unless msg
-
-            msg << ": #{val['alert']['text'].inspect}" if val['alert'].is_a?(Hash) && val['alert']['text']
-            msg << " (#{val['class']})" if val['class']
-            msg
-          when String
-            val
-          else
-            "unknown error, status=#{status}: #{val.inspect}"
-          end
-        end
-
         def [](key)
           @payload[key]
         end
@@ -76,14 +60,7 @@ module Selenium
           raise Error::ServerError, self
         end
 
-        def add_backtrace(ex)
-          return unless error_payload.is_a?(Hash)
-
-          # Legacy Firefox returns String in ['value'], while we expect Hash.
-          # Use #dig when Firefox legacy is removed (4.0).
-          server_trace = error_payload[STACKTRACE_KEY] ||
-                         error_payload[STACKTRACE_KEY.downcase] ||
-                         (error_payload['value'] && error_payload['value'][STACKTRACE_KEY])
+        def add_backtrace(ex, server_trace)
           return unless server_trace
 
           backtrace = case server_trace
@@ -113,22 +90,14 @@ module Selenium
           }.compact
         end
 
-        def error_payload
-          # Even errors are wrapped in 'value' for w3c
-          # Grab 'value' key for error, leave original payload alone and let the bridge process
-          @error_payload ||= !@payload.key?('sessionId') ? @payload['value'] : @payload
-        end
-
-        def status
-          return unless error_payload.is_a? Hash
-
-          @status ||= error_payload['status'] || error_payload['error']
-        end
-
-        def value
-          return unless error_payload.is_a? Hash
+        def process_error
+          return unless self['value'].is_a?(Hash)
 
-          @value ||= error_payload['value'] || error_payload['message']
+          [
+            self['value']['error'],
+            self['value']['message'],
+            self['value']['stacktrace']
+          ]
         end
       end # Response
     end # Remote

data/lib/selenium/webdriver/safari.rb

@@ -30,7 +30,7 @@ module Selenium
         end
 
         def technology_preview!
-          self.driver_path = technology_preview
+          Service.driver_path = technology_preview
         end
 
         def path=(path)

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

@@ -24,9 +24,9 @@ module Selenium
 
         # https://developer.apple.com/library/content/documentation/NetworkingInternetWeb/Conceptual/WebDriverEndpointDoc/Commands/Commands.html
         COMMANDS = {
-          get_permissions: [:get, 'session/:session_id/apple/permissions'],
-          set_permissions: [:post, 'session/:session_id/apple/permissions'],
-          attach_debugger: [:post, 'session/:session_id/apple/attach_debugger']
+          get_permissions: [:get, '/session/:session_id/apple/permissions'],
+          set_permissions: [:post, '/session/:session_id/apple/permissions'],
+          attach_debugger: [:post, '/session/:session_id/apple/attach_debugger']
         }.freeze
 
         def commands(command)

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

@@ -37,8 +37,11 @@ module Selenium
           opts[:url] ||= service_url(opts)
 
           listener = opts.delete(:listener)
-          @bridge = Remote::Bridge.handshake(**opts)
+          desired_capabilities = opts.delete(:desired_capabilities)
+
+          @bridge = Remote::Bridge.new(opts)
           @bridge.extend Bridge
+          @bridge.create_session(desired_capabilities)
 
           super(@bridge, listener: listener)
         end

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

@@ -25,13 +25,13 @@ module Selenium
       #
 
       class Service < WebDriver::Service
-        @default_port = 7050
-        @executable = 'safaridriver'
-        @missing_text = <<~ERROR
+        DEFAULT_PORT = 7050
+        EXECUTABLE = 'safaridriver'
+        MISSING_TEXT = <<~ERROR
           Unable to find Apple's safaridriver which comes with Safari 10.
           More info at https://webkit.org/blog/6900/webdriver-support-in-safari-10/
         ERROR
-        @shutdown_supported = false
+        SHUTDOWN_SUPPORTED = false
       end # Service
     end # Safari
   end # WebDriver

data/lib/selenium/webdriver/support/select.rb

@@ -242,7 +242,7 @@ module Selenium
           xpath = ".//option[normalize-space(.) = #{Escaper.escape text}]"
           opts = @element.find_elements(xpath: xpath)
 
-          return opts unless opts.empty? && text =~ /\s+/
+          return opts unless opts.empty? && /\s+/.match?(text)
 
           longest_word = text.split(/\s+/).max_by(&:length)
           if longest_word.empty?

data/lib/selenium/webdriver/version.rb

@@ -19,6 +19,6 @@
 
 module Selenium
   module WebDriver
-    VERSION = '3.142.7'
+    VERSION = '4.0.0.alpha1'
   end # WebDriver
 end # Selenium

data/selenium-webdriver.gemspec

@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
   }
 
   s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to? :required_rubygems_version=
-  s.required_ruby_version = Gem::Requirement.new('>= 2.3')
+  s.required_ruby_version = Gem::Requirement.new('>= 2.4')
 
   s.files = Dir[root + '/**/*'].reject { |e| e =~ /ruby\.iml|build\.desc/ }.map { |e| e.sub(root + '/', '') }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'childprocess', ['>= 0.5', '< 4.0']
-  s.add_runtime_dependency 'rubyzip', ['>= 1.2.2']
+  s.add_runtime_dependency 'childprocess', ['>= 0.5', '< 2.0']
+  s.add_runtime_dependency 'rubyzip', ['~> 1.2', '>= 1.2.2']
 
   # childprocess requires ffi on windows but doesn't declare it in its dependencies
   s.add_development_dependency 'ffi'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 3.142.7
+  version: 4.0.0.alpha1
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -20,7 +20,7 @@ dependencies:
         version: '0.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
   name: childprocess
   prerelease: false
   type: :runtime
@@ -31,10 +31,13 @@ dependencies:
         version: '0.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
@@ -43,6 +46,9 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
@@ -255,6 +261,7 @@ files:
 - lib/selenium/webdriver/common/touch_screen.rb
 - lib/selenium/webdriver/common/w3c_action_builder.rb
 - lib/selenium/webdriver/common/w3c_manager.rb
+- lib/selenium/webdriver/common/w3c_options.rb
 - lib/selenium/webdriver/common/wait.rb
 - lib/selenium/webdriver/common/window.rb
 - lib/selenium/webdriver/common/zipper.rb
@@ -265,6 +272,7 @@ files:
 - lib/selenium/webdriver/edge/service.rb
 - lib/selenium/webdriver/firefox.rb
 - lib/selenium/webdriver/firefox/binary.rb
+- lib/selenium/webdriver/firefox/bridge.rb
 - lib/selenium/webdriver/firefox/driver.rb
 - lib/selenium/webdriver/firefox/extension.rb
 - lib/selenium/webdriver/firefox/extension/prefs.json
@@ -287,6 +295,7 @@ files:
 - lib/selenium/webdriver/remote.rb
 - lib/selenium/webdriver/remote/bridge.rb
 - lib/selenium/webdriver/remote/capabilities.rb
+- lib/selenium/webdriver/remote/commands.rb
 - lib/selenium/webdriver/remote/driver.rb
 - lib/selenium/webdriver/remote/http/common.rb
 - lib/selenium/webdriver/remote/http/curb.rb
@@ -327,7 +336,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"