RubyGems - selenium-webdriver - Versions diffs - 4.0.0.beta2 → 4.0.0.beta3 - Mend

selenium-webdriver 4.0.0.beta2 → 4.0.0.beta3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

checksums.yaml +4 -4
data/lib/selenium/webdriver/chrome/driver.rb +11 -0
data/lib/selenium/webdriver/chrome/profile.rb +5 -2
data/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb +0 -17
data/lib/selenium/webdriver/common/driver_extensions/prints_page.rb +28 -1
data/lib/selenium/webdriver/common/element.rb +20 -0
data/lib/selenium/webdriver/common/options.rb +11 -6
data/lib/selenium/webdriver/common/socket_poller.rb +19 -30
data/lib/selenium/webdriver/firefox/driver.rb +9 -2
data/lib/selenium/webdriver/remote/bridge.rb +14 -1
data/lib/selenium/webdriver/remote/capabilities.rb +105 -52
data/lib/selenium/webdriver/remote/commands.rb +2 -0
data/lib/selenium/webdriver/remote/driver.rb +5 -7
data/lib/selenium/webdriver/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f868be1b0140d1e41a8f499f4e4dad8f24f63716eb32094425c03adc0aadbd18
-  data.tar.gz: 67bc7e4c0fa98744e8d9a4242c86fc281de24eaad4766de954b50c697ba0783d
+  metadata.gz: d43cea1b9a19e329eee91c38bb566fc2c7adb76df2da6a7efa2eee908910a9a3
+  data.tar.gz: cd692d2a4f562dffcb0608cfd19adec5e383509d3f150826791c7312969b0aa9
 SHA512:
-  metadata.gz: 8cb6d82d27e472611fcfc64802febc3a192eace5c9b8ccf0a2709fadf8b3f96f090eb1c83bba081bda41c830c698c8d487cc1e7d7fbf1e0053833f156e99cadf
-  data.tar.gz: 207f9e36de333d0033b0e24ad451d640a5076ee65e3d59e2304852fb40d5caa0cdd1ea45b98a5c853f2ce7c4cc6ed0deb597c70d68d830cdd619be41683161d2
+  metadata.gz: 695aa88517dc97ab25d93a1f0b983bc3a6fa55e48460d5e8ed053e300227b6b1b2693e243b8a439652d921b75eba1ac06384a33fc0c40e2cb4b194ee66483d3f
+  data.tar.gz: acbe3d962300eff073ce447548fb41adb62ac56f238074f3f33c0bb43ccb4ef200daab53f1ff478f20f7efe67d3fcffc34e11d0b0959f929b9c7ffcac9afad0b

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

@@ -48,6 +48,17 @@ module Selenium
         private
+        def devtools_url
+          uri = URI(devtools_address)
+          response = Net::HTTP.get(uri.hostname, '/json/version', uri.port)
+          JSON.parse(response)['webSocketDebuggerUrl']
+        end
+        def devtools_version
+          Integer(capabilities.browser_version.split('.').first)
+        end
         def devtools_address
           "http://#{capabilities['goog:chromeOptions']['debuggerAddress']}"
         end

data/lib/selenium/webdriver/chrome/profile.rb CHANGED Viewed

@@ -27,12 +27,11 @@ module Selenium
       class Profile
         include ProfileHelper
-        attr_reader :directory
         def initialize(model = nil)
           @model = verify_model(model)
           @extensions = []
           @encoded_extensions = []
+          @directory = nil
         end
         def add_extension(path)
@@ -45,6 +44,10 @@ module Selenium
           @encoded_extensions << encoded
         end
+        def directory
+          @directory || layout_on_disk
+        end
         #
         # Set a preference in the profile.
         #

data/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb CHANGED Viewed

@@ -37,23 +37,6 @@ module Selenium
           end
         end
-        private
-        def devtools_version
-          return Firefox::DEVTOOLS_VERSION if browser == :firefox
-          Integer(capabilities.browser_version.split('.').first)
-        end
-        def devtools_url
-          return devtools_address if devtools_address.include?('/session/')
-          uri = URI(devtools_address)
-          response = Net::HTTP.get(uri.hostname, '/json/version', uri.port)
-          JSON.parse(response)['webSocketDebuggerUrl']
-        end
       end # HasDevTools
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/driver_extensions/prints_page.rb CHANGED Viewed

@@ -21,8 +21,35 @@ module Selenium
   module WebDriver
     module DriverExtensions
       module PrintsPage
+        #
+        # Save a page as a PDF to the given path
+        #
+        # @example Save Printed Page
+        #   driver.save_print_page('../printed_page.pdf')
+        #
+        # @param [String] path to where the pdf should be saved
+        #
+        # @api public
+        #
+        def save_print_page(path, **options)
+          File.open(path, 'wb') do |file|
+            content = Base64.decode64 print_page(options)
+            file << content
+          end
+        end
+        #
+        # Return a Base64 encoded Print Page as a string
+        #
+        # @see https://w3c.github.io/webdriver/#print-page
+        #
+        # @api public
+        #
         def print_page(**options)
-          options[:page_ranges] &&= Array(options[:page_ranges])
+          options[:pageRanges] = Array(options.delete(:page_ranges)) || []
+          options[:shrinkToFit] = options.delete(:shrink_to_fit) { true }
           @bridge.print_page(options)
         end

data/lib/selenium/webdriver/common/element.rb CHANGED Viewed

@@ -160,6 +160,26 @@ module Selenium
         bridge.element_property self, name
       end
+      #
+      # Gets the computed WAI-ARIA role of element
+      #
+      # @return [String]
+      #
+      def aria_role
+        bridge.element_aria_role self
+      end
+      #
+      # Gets the computed WAI-ARIA label of element.
+      #
+      # @return [String]
+      #
+      def accessible_name
+        bridge.element_aria_label self
+      end
       #
       # Get the text content of this element
       #

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

@@ -134,12 +134,7 @@ module Selenium
       def generate_as_json(value, camelize_keys: true)
         if value.is_a?(Hash)
-          value.each_with_object({}) do |(key, val), hash|
-            next if val.respond_to?(:empty?) && val.empty?
-            key = convert_json_key(key, camelize: camelize_keys)
-            hash[key] = generate_as_json(val, camelize_keys: camelize?(key))
-          end
+          process_json_hash(value, camelize_keys)
         elsif value.respond_to?(:as_json)
           value.as_json
         elsif value.is_a?(Array)
@@ -151,6 +146,16 @@ module Selenium
         end
       end
+      def process_json_hash(value, camelize_keys)
+        value.each_with_object({}) do |(key, val), hash|
+          next if val.respond_to?(:empty?) && val.empty?
+          camelize = camelize_keys ? camelize?(key) : false
+          key = convert_json_key(key, camelize: camelize)
+          hash[key] = generate_as_json(val, camelize_keys: camelize)
+        end
+      end
       def convert_json_key(key, camelize: true)
         key = key.to_s if key.is_a?(Symbol)
         key = camel_case(key) if camelize

data/lib/selenium/webdriver/common/socket_poller.rb CHANGED Viewed

@@ -65,37 +65,26 @@ module Selenium
         arr << Errno::EALREADY if Platform.wsl?
       }.freeze
-      if Platform.jruby?
-        # we use a plain TCPSocket here since JRuby has issues closing socket
-        # see https://github.com/jruby/jruby/issues/5709
-        def listening?
-          TCPSocket.new(@host, @port).close
-          true
-        rescue *NOT_CONNECTED_ERRORS
-          false
-        end
-      else
-        def listening?
-          addr     = Socket.getaddrinfo(@host, @port, Socket::AF_INET, Socket::SOCK_STREAM)
-          sock     = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-          sockaddr = Socket.pack_sockaddr_in(@port, addr[0][3])
-          begin
-            sock.connect_nonblock sockaddr
-          rescue Errno::EINPROGRESS
-            retry if socket_writable?(sock) && conn_completed?(sock)
-            raise Errno::ECONNREFUSED
-          rescue *CONNECTED_ERRORS
-            # yay!
-          end
-          sock.close
-          true
-        rescue *NOT_CONNECTED_ERRORS
-          sock&.close
-          WebDriver.logger.debug("polling for socket on #{[@host, @port].inspect}")
-          false
+      def listening?
+        addr     = Socket.getaddrinfo(@host, @port, Socket::AF_INET, Socket::SOCK_STREAM)
+        sock     = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+        sockaddr = Socket.pack_sockaddr_in(@port, addr[0][3])
+        begin
+          sock.connect_nonblock sockaddr
+        rescue Errno::EINPROGRESS
+          retry if socket_writable?(sock) && conn_completed?(sock)
+          raise Errno::ECONNREFUSED
+        rescue *CONNECTED_ERRORS
+          # yay!
         end
+        sock.close
+        true
+      rescue *NOT_CONNECTED_ERRORS
+        sock&.close
+        WebDriver.logger.debug("polling for socket on #{[@host, @port].inspect}")
+        false
       end
       def socket_writable?(sock)

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

@@ -40,8 +40,15 @@ module Selenium
         private
-        def devtools_address
-          "http://#{capabilities['moz:debuggerAddress']}"
+        def devtools_url
+          uri = URI("http://#{capabilities['moz:debuggerAddress']}")
+          response = Net::HTTP.get(uri.hostname, '/json/version', uri.port)
+          JSON.parse(response)['webSocketDebuggerUrl']
+        end
+        def devtools_version
+          Firefox::DEVTOOLS_VERSION
         end
       end # Driver
     end # Firefox

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

@@ -49,7 +49,7 @@ module Selenium
         #
         def create_session(capabilities)
-          response = execute(:new_session, {}, {capabilities: {firstMatch: [capabilities]}})
+          response = execute(:new_session, {}, prepare_capabilities_payload(capabilities))
           @session_id = response['sessionId']
           capabilities = response['capabilities']
@@ -458,6 +458,14 @@ module Selenium
           execute :get_element_property, id: element.ref, name: name
         end
+        def element_aria_role(element)
+          execute :get_element_aria_role, id: element.ref
+        end
+        def element_aria_label(element)
+          execute :get_element_aria_label, id: element.ref
+        end
         def element_value(element)
           element_property element, 'value'
         end
@@ -594,6 +602,11 @@ module Selenium
           id['ELEMENT'] || id['element-6066-11e4-a52e-4f735466cecf']
         end
+        def prepare_capabilities_payload(capabilities)
+          capabilities = {firstMatch: [capabilities]} if !capabilities['alwaysMatch'] && !capabilities['firstMatch']
+          {capabilities: capabilities}
+        end
         def convert_locator(how, what)
           how = SearchContext::FINDERS[how.to_sym] || how

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

@@ -40,22 +40,15 @@ module Selenium
           :unhandled_prompt_behavior,
           :strict_file_interactability,
-          # remote-specific
-          :remote_session_id,
-          # TODO: (AR) deprecate compatibility with OSS-capabilities
-          :implicit_timeout,
-          :page_load_timeout,
-          :script_timeout
+          # remote-specific (webdriver.remote.sessionid)
+          :remote_session_id
         ].freeze
-        KNOWN.each do |key|
+        (KNOWN - %i[proxy timeouts]).each do |key|
           define_method key do
             @capabilities.fetch(key)
           end
-          next if key == :proxy
           define_method "#{key}=" do |value|
             @capabilities[key] = value
           end
@@ -89,16 +82,10 @@ module Selenium
           alias_method :microsoftedge, :edge
           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)
-            opts.delete(:timeouts) if opts[:timeouts].empty?
-            new({browser_name: 'firefox'}.merge(opts))
+            new({
+              browser_name: 'firefox'
+            }.merge(opts))
           end
           alias_method :ff, :firefox
           def safari(opts = {})
@@ -121,18 +108,21 @@ module Selenium
           end
           alias_method :ie, :internet_explorer
+          def always_match(capabilities)
+            new(always_match: capabilities)
+          end
+          def first_match(*capabilities)
+            new(first_match: capabilities)
+          end
           #
           # @api private
           #
           def json_create(data)
             data = data.dup
             caps = new
-            (KNOWN - %i[timeouts proxy]).each do |cap|
-              data_value = camel_case(cap)
-              caps[cap] = data.delete(data_value) if data.key?(data_value)
-            end
             process_timeouts(caps, data.delete('timeouts'))
@@ -146,6 +136,11 @@ module Selenium
               caps[:remote_session_id] = data.delete('webdriver.remote.sessionid')
             end
+            KNOWN.each do |cap|
+              data_value = camel_case(cap)
+              caps[cap] = data.delete(data_value) if data.key?(data_value)
+            end
             # any remaining pairs will be added as is, with no conversion
             caps.merge!(data)
@@ -179,8 +174,9 @@ module Selenium
         #
         def initialize(opts = {})
-          @capabilities = opts
-          self.proxy = opts.delete(:proxy)
+          @capabilities = {}
+          self.proxy = opts.delete(:proxy) if opts[:proxy]
+          @capabilities.merge!(opts)
         end
         #
@@ -205,6 +201,10 @@ module Selenium
           end
         end
+        def proxy
+          @capabilities.fetch(:proxy)
+        end
         def proxy=(proxy)
           case proxy
           when Hash
@@ -216,33 +216,46 @@ module Selenium
           end
         end
+        def timeouts
+          @capabilities[:timeouts] ||= {}
+        end
+        def timeouts=(timeouts)
+          @capabilities[:timeouts] = timeouts
+        end
+        def implicit_timeout
+          timeouts[:implicit]
+        end
+        def implicit_timeout=(timeout)
+          timeouts[:implicit] = timeout
+        end
+        def page_load_timeout
+          timeouts[:page_load] || timeouts[:pageLoad]
+        end
+        def page_load_timeout=(timeout)
+          timeouts[:page_load] = timeout
+        end
+        def script_timeout
+          timeouts[:script]
+        end
+        def script_timeout=(timeout)
+          timeouts[:script] = timeout
+        end
         #
         # @api private
         #
         def as_json(*)
-          hash = {}
-          @capabilities.each do |key, value|
-            case key
-            when :platform
-              hash['platform'] = value.to_s.upcase
-            when :proxy
-              next unless value
-              process_proxy(hash, value)
-            when :unhandled_prompt_behavior
-              hash['unhandledPromptBehavior'] = value.is_a?(Symbol) ? value.to_s.tr('_', ' ') : value
-            when String
-              hash[key.to_s] = value
-            when Symbol
-              hash[self.class.camel_case(key)] = value
-            else
-              raise TypeError, "expected String or Symbol, got #{key.inspect}:#{key.class} / #{value.inspect}"
-            end
+          @capabilities.each_with_object({}) do |(key, value), hash|
+            hash[convert_key(key)] = process_capabilities(key, value, hash)
           end
-          hash
         end
         def to_json(*)
@@ -263,13 +276,53 @@ module Selenium
         private
-        def process_proxy(hash, value)
-          hash['proxy'] = value.as_json
-          hash['proxy']['proxyType'] &&= hash['proxy']['proxyType'].downcase
+        def process_capabilities(key, value, hash)
+          case value
+          when Array
+            value.map { |v| process_capabilities(key, v, hash) }
+          when Hash
+            value.each_with_object({}) do |(k, v), h|
+              h[convert_key(k)] = process_capabilities(k, v, h)
+            end
+          when Capabilities, Options
+            value.as_json
+          else
+            convert_value(key, value)
+          end
+        end
+        def convert_key(key)
+          case key
+          when String
+            key.to_s
+          when Symbol
+            self.class.camel_case(key)
+          else
+            raise TypeError, "expected String or Symbol, got #{key.inspect}:#{key.class}"
+          end
+        end
-          return unless hash['proxy']['noProxy'].is_a?(String)
+        def convert_value(key, value)
+          case key
+          when :platform
+            value.to_s.upcase
+          when :proxy
+            convert_proxy(value)
+          when :unhandled_prompt_behavior
+            value.is_a?(Symbol) ? value.to_s.tr('_', ' ') : value
+          else
+            value
+          end
+        end
-          hash['proxy']['noProxy'] = hash['proxy']['noProxy'].split(', ')
+        def convert_proxy(value)
+          return unless value
+          hash = value.as_json
+          hash['proxyType'] &&= hash['proxyType'].downcase
+          hash['noProxy'] = hash['noProxy'].split(', ') if hash['noProxy'].is_a?(String)
+          hash
         end
       end # Capabilities
     end # Remote

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

@@ -82,6 +82,8 @@ module Selenium
           get_element_attribute: [:get, 'session/:session_id/element/:id/attribute/:name'],
           get_element_property: [:get, 'session/:session_id/element/:id/property/:name'],
           get_element_css_value: [:get, 'session/:session_id/element/:id/css/:property_name'],
+          get_element_aria_role: [:get, 'session/:session_id/element/:id/computedrole'],
+          get_element_aria_label: [:get, 'session/:session_id/element/:id/computedlabel'],
           get_element_text: [:get, 'session/:session_id/element/:id/text'],
           get_element_tag_name: [:get, 'session/:session_id/element/:id/name'],
           get_element_rect: [:get, 'session/:session_id/element/:id/rect'],

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

@@ -44,17 +44,15 @@ module Selenium
           super
         end
-        def print_page(**options)
-          options[:page_ranges] &&= Array(options[:page_ranges])
-          @bridge.print_page(options)
-        end
         private
-        def devtools_address
+        def devtools_url
           capabilities['se:cdp']
         end
+        def devtools_version
+          capabilities['se:cdpVersion'].split('.').first
+        end
       end # Driver
     end # Remote
   end # WebDriver

data/lib/selenium/webdriver/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement