selenium-webdriver 4.0.0.beta4 → 4.0.0

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

@@ -25,7 +25,7 @@ module Selenium
 
         PORT = 4444
 
-        attr_accessor :context, :http, :file_detector
+        attr_accessor :http, :file_detector
         attr_reader :capabilities
 
         #
@@ -93,17 +93,16 @@ module Selenium
           execute :get, {}, {url: url}
         end
 
-        def implicit_wait_timeout=(milliseconds)
-          timeout('implicit', milliseconds)
-        end
+        #
+        # timeouts
+        #
 
-        def script_timeout=(milliseconds)
-          timeout('script', milliseconds)
+        def timeouts
+          execute :get_timeouts, {}
         end
 
-        def timeout(type, milliseconds)
-          type = 'pageLoad' if type == 'page load'
-          execute :set_timeout, {}, {type => milliseconds}
+        def timeouts=(timeouts)
+          execute :set_timeout, {}, timeouts
         end
 
         #
@@ -269,7 +268,7 @@ module Selenium
         end
 
         def element_screenshot(element)
-          execute :take_element_screenshot, id: element.ref
+          execute :take_element_screenshot, id: element
         end
 
         #
@@ -431,7 +430,7 @@ module Selenium
         end
 
         def submit_element(element)
-          form = find_element_by('xpath', "./ancestor-or-self::form", element)
+          form = find_element_by('xpath', "./ancestor-or-self::form", [:element, element])
           execute_script("var e = arguments[0].ownerDocument.createEvent('Event');" \
                             "e.initEvent('submit', true, true);" \
                             'if (arguments[0].dispatchEvent(e)) { arguments[0].submit() }', form.as_json)
@@ -451,19 +450,19 @@ module Selenium
         end
 
         def element_dom_attribute(element, name)
-          execute :get_element_attribute, id: element.ref, name: name
+          execute :get_element_attribute, id: element, name: name
         end
 
         def element_property(element, name)
-          execute :get_element_property, id: element.ref, name: name
+          execute :get_element_property, id: element, name: name
         end
 
         def element_aria_role(element)
-          execute :get_element_aria_role, id: element.ref
+          execute :get_element_aria_role, id: element
         end
 
         def element_aria_label(element)
-          execute :get_element_aria_label, id: element.ref
+          execute :get_element_aria_label, id: element
         end
 
         def element_value(element)
@@ -524,13 +523,17 @@ module Selenium
 
         alias_method :switch_to_active_element, :active_element
 
-        def find_element_by(how, what, parent = nil)
+        def find_element_by(how, what, parent_ref = [])
           how, what = convert_locator(how, what)
 
           return execute_atom(:findElements, Support::RelativeLocator.new(what).as_json).first if how == 'relative'
 
-          id = if parent
-                 execute :find_child_element, {id: parent}, {using: how, value: what.to_s}
+          parent_type, parent_id = parent_ref
+          id = case parent_type
+               when :element
+                 execute :find_child_element, {id: parent_id}, {using: how, value: what.to_s}
+               when :shadow_root
+                 execute :find_shadow_child_element, {id: parent_id}, {using: how, value: what.to_s}
                else
                  execute :find_element, {}, {using: how, value: what.to_s}
                end
@@ -538,13 +541,17 @@ module Selenium
           Element.new self, element_id_from(id)
         end
 
-        def find_elements_by(how, what, parent = nil)
+        def find_elements_by(how, what, parent_ref = [])
           how, what = convert_locator(how, what)
 
           return execute_atom :findElements, Support::RelativeLocator.new(what).as_json if how == 'relative'
 
-          ids = if parent
-                  execute :find_child_elements, {id: parent}, {using: how, value: what.to_s}
+          parent_type, parent_id = parent_ref
+          ids = case parent_type
+                when :element
+                  execute :find_child_elements, {id: parent_id}, {using: how, value: what.to_s}
+                when :shadow_root
+                  execute :find_shadow_child_elements, {id: parent_id}, {using: how, value: what.to_s}
                 else
                   execute :find_elements, {}, {using: how, value: what.to_s}
                 end
@@ -552,6 +559,11 @@ module Selenium
           ids.map { |id| Element.new self, element_id_from(id) }
         end
 
+        def shadow_root(element)
+          id = execute :get_element_shadow_root, id: element
+          ShadowRoot.new self, shadow_root_id_from(id)
+        end
+
         private
 
         #
@@ -599,7 +611,11 @@ module Selenium
         end
 
         def element_id_from(id)
-          id['ELEMENT'] || id['element-6066-11e4-a52e-4f735466cecf']
+          id['ELEMENT'] || id[Element::ELEMENT_KEY]
+        end
+
+        def shadow_root_id_from(id)
+          id[ShadowRoot::ROOT_KEY]
         end
 
         def prepare_capabilities_payload(capabilities)
@@ -641,7 +657,7 @@ module Selenium
         # @see https://mathiasbynens.be/notes/css-escapes
         def escape_css(string)
           string = string.gsub(ESCAPE_CSS_REGEXP) { |match| "\\#{match}" }
-          string = "\\#{UNICODE_CODE_POINT + Integer(string[0])} #{string[1..-1]}" if string[0]&.match?(/[[:digit:]]/)
+          string = "\\#{UNICODE_CODE_POINT + Integer(string[0])} #{string[1..]}" if string[0]&.match?(/[[:digit:]]/)
 
           string
         end

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

@@ -39,6 +39,7 @@ module Selenium
           :timeouts,
           :unhandled_prompt_behavior,
           :strict_file_interactability,
+          :web_socket_url,
 
           # remote-specific (webdriver.remote.sessionid)
           :remote_session_id
@@ -46,7 +47,7 @@ module Selenium
 
         (KNOWN - %i[proxy timeouts]).each do |key|
           define_method key do
-            @capabilities.fetch(key)
+            @capabilities[key]
           end
 
           define_method "#{key}=" do |value|
@@ -202,7 +203,7 @@ module Selenium
         end
 
         def proxy
-          @capabilities.fetch(:proxy)
+          @capabilities[:proxy]
         end
 
         def proxy=(proxy)

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

@@ -77,7 +77,10 @@ module Selenium
           find_elements: [:post, 'session/:session_id/elements'],
           find_child_element: [:post, 'session/:session_id/element/:id/element'],
           find_child_elements: [:post, 'session/:session_id/element/:id/elements'],
+          find_shadow_child_element: [:post, 'session/:session_id/shadow/:id/element'],
+          find_shadow_child_elements: [:post, 'session/:session_id/shadow/:id/elements'],
           get_active_element: [:get, 'session/:session_id/element/active'],
+          get_element_shadow_root: [:get, 'session/:session_id/element/:id/shadow'],
           is_element_selected: [:get, 'session/:session_id/element/:id/selected'],
           get_element_attribute: [:get, 'session/:session_id/element/:id/attribute/:name'],
           get_element_property: [:get, 'session/:session_id/element/:id/property/:name'],
@@ -111,6 +114,7 @@ module Selenium
           # timeouts
           #
 
+          get_timeouts: [:get, 'session/:session_id/timeouts'],
           set_timeout: [:post, 'session/:session_id/timeouts'],
 
           #

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

@@ -42,6 +42,7 @@ module Selenium
           end
           opts[:url] ||= "http://#{Platform.localhost}:4444/wd/hub"
           super
+          @bridge.file_detector = ->((filename, *)) { File.exist?(filename) && filename.to_s }
         end
 
         private
@@ -51,7 +52,8 @@ module Selenium
         end
 
         def devtools_version
-          capabilities['se:cdpVersion'].split('.').first
+          capabilities['se:cdpVersion']&.split('.')&.first ||
+            raise(Error::WebDriverError, "DevTools is not supported by the Remote Server")
         end
       end # Driver
     end # Remote

data/lib/selenium/webdriver/remote.rb

@@ -18,6 +18,7 @@
 # under the License.
 
 require 'uri'
+require 'selenium/webdriver/remote/server_error'
 
 module Selenium
   module WebDriver
@@ -25,7 +26,6 @@ module Selenium
       autoload :Bridge, 'selenium/webdriver/remote/bridge'
       autoload :Driver, 'selenium/webdriver/remote/driver'
       autoload :Response, 'selenium/webdriver/remote/response'
-      autoload :ServerError, 'selenium/webdriver/remote/server_error'
       autoload :Capabilities, 'selenium/webdriver/remote/capabilities'
       autoload :COMMANDS, 'selenium/webdriver/remote/commands'
       module Http

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

@@ -28,7 +28,7 @@ module Selenium
 
       class Driver < WebDriver::Driver
         EXTENSIONS = [DriverExtensions::HasDebugger,
-                      DriverExtensions::HasPermissions,
+                      DriverExtensions::HasApplePermissions,
                       DriverExtensions::HasWebStorage].freeze
 
         def browser

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

@@ -28,6 +28,13 @@ module Selenium
                         automatic_profiling: 'safari:automaticProfiling'}.freeze
         BROWSER = 'safari'
 
+        def add_option(name, value = nil)
+          key = name.is_a?(Hash) ? name.keys.first : name
+          raise ArgumentError, 'Safari does not support options that are not namespaced' unless key.to_s.include?(':')
+
+          super
+        end
+
       end # Options
     end # Safari
   end # WebDriver

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

@@ -76,7 +76,7 @@ module Selenium
             @delegate.find_element_by how, what, parent
           end
 
-          Element.new self, e.ref
+          Element.new self, e.ref.last
         end
 
         def find_elements_by(how, what, parent = nil)
@@ -84,7 +84,7 @@ module Selenium
             @delegate.find_elements_by(how, what, parent)
           end
 
-          es.map { |e| Element.new self, e.ref }
+          es.map { |e| Element.new self, e.ref.last }
         end
 
         def execute_script(script, *args)

data/lib/selenium/webdriver/version.rb

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

data/lib/selenium/webdriver.rb

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

data/selenium-webdriver.gemspec

@@ -28,7 +28,7 @@ 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.5')
+  s.required_ruby_version = Gem::Requirement.new('>= 2.6')
 
   s.files = [
     'CHANGES',
@@ -45,11 +45,12 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'childprocess', ['>= 0.5', '< 5.0']
-  s.add_runtime_dependency 'rexml', ['~> 3.2']
+  s.add_runtime_dependency 'rexml', ['~> 3.2', '>= 3.2.5']
   s.add_runtime_dependency 'rubyzip', ['>= 1.2.2']
 
   # childprocess requires ffi on windows but doesn't declare it in its dependencies
   s.add_development_dependency 'ffi'
+  s.add_development_dependency 'pry', ['~> 0.14']
   s.add_development_dependency 'rack', ['~> 2.0']
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', ['~> 3.0']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta4
+  version: 4.0.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -39,6 +39,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,6 +49,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -238,10 +258,14 @@ files:
 - lib/selenium/webdriver/common/driver_extensions/downloads_files.rb
 - lib/selenium/webdriver/common/driver_extensions/full_page_screenshot.rb
 - lib/selenium/webdriver/common/driver_extensions/has_addons.rb
+- lib/selenium/webdriver/common/driver_extensions/has_apple_permissions.rb
 - lib/selenium/webdriver/common/driver_extensions/has_authentication.rb
+- lib/selenium/webdriver/common/driver_extensions/has_casting.rb
 - lib/selenium/webdriver/common/driver_extensions/has_cdp.rb
+- lib/selenium/webdriver/common/driver_extensions/has_context.rb
 - 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
@@ -249,6 +273,7 @@ files:
 - 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
 - lib/selenium/webdriver/common/driver_extensions/has_remote_status.rb
 - lib/selenium/webdriver/common/driver_extensions/has_session_id.rb
 - lib/selenium/webdriver/common/driver_extensions/has_web_storage.rb
@@ -282,6 +307,7 @@ files:
 - lib/selenium/webdriver/common/search_context.rb
 - lib/selenium/webdriver/common/service.rb
 - lib/selenium/webdriver/common/service_manager.rb
+- lib/selenium/webdriver/common/shadow_root.rb
 - lib/selenium/webdriver/common/socket_lock.rb
 - lib/selenium/webdriver/common/socket_poller.rb
 - lib/selenium/webdriver/common/takes_screenshot.rb
@@ -294,7 +320,9 @@ files:
 - lib/selenium/webdriver/devtools/console_event.rb
 - lib/selenium/webdriver/devtools/exception_event.rb
 - lib/selenium/webdriver/devtools/mutation_event.rb
+- lib/selenium/webdriver/devtools/pinned_script.rb
 - lib/selenium/webdriver/devtools/request.rb
+- lib/selenium/webdriver/devtools/response.rb
 - lib/selenium/webdriver/edge.rb
 - lib/selenium/webdriver/edge/driver.rb
 - lib/selenium/webdriver/edge/features.rb
@@ -358,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"