selenium-webdriver 4.0.0.beta1 → 4.0.0.beta2

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

@@ -93,7 +93,10 @@ module Selenium
         when 1
           arg = args.first
 
-          raise ArgumentError, "expected #{arg.inspect}:#{arg.class} to respond to #shift" unless arg.respond_to?(:shift)
+          unless arg.respond_to?(:shift)
+            raise ArgumentError,
+                  "expected #{arg.inspect}:#{arg.class} to respond to #shift"
+          end
 
           # this will be a single-entry hash, so use #shift over #first or #[]
           arr = arg.dup.shift

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

@@ -44,6 +44,7 @@ module Selenium
         def edge(**opts)
           Edge::Service.new(**opts)
         end
+        alias_method :microsoftedge, :edge
 
         def safari(**opts)
           Safari::Service.new(**opts)

data/lib/selenium/webdriver/devtools.rb

@@ -23,19 +23,16 @@ module Selenium
       autoload :ConsoleEvent, 'selenium/webdriver/devtools/console_event'
       autoload :ExceptionEvent, 'selenium/webdriver/devtools/exception_event'
       autoload :MutationEvent, 'selenium/webdriver/devtools/mutation_event'
+      autoload :Request, 'selenium/webdriver/devtools/request'
 
-      SUPPORTED_VERSIONS = [85, 86, 87, 88].freeze
-
-      def initialize(url:, version:)
+      def initialize(url:)
         @messages = []
-        @uri = URI("http://#{url}")
+        @session_id = nil
+        @url = url
 
-        load_devtools_version(version)
         process_handshake
         attach_socket_listener
-
-        target.attach_to_target(target_id: page_target['id'])
-        target.set_auto_attach(auto_attach: true, wait_for_debugger_on_start: false)
+        start_session
       end
 
       def callbacks
@@ -44,7 +41,9 @@ module Selenium
 
       def send_cmd(method, **params)
         id = next_id
-        data = JSON.generate(id: id, method: method, params: params.reject { |_, v| v.nil? })
+        data = {id: id, method: method, params: params.reject { |_, v| v.nil? }}
+        data[:sessionId] = @session_id if @session_id
+        data = JSON.generate(data)
         WebDriver.logger.debug "DevTools -> #{data}"
 
         out_frame = WebSocket::Frame::Outgoing::Client.new(version: ws.version, data: data, type: 'text')
@@ -59,16 +58,26 @@ module Selenium
         message
       end
 
-      private
+      def method_missing(method, *_args)
+        desired_class = "Selenium::DevTools::V#{Selenium::DevTools.version}::#{method.capitalize}"
+        return unless Object.const_defined?(desired_class)
 
-      def load_devtools_version(version)
-        closest_version = SUPPORTED_VERSIONS.min_by { |v| (version - v).abs }
-        WebDriver.logger.info("Loading DevTools::V#{closest_version} for #{version}.")
-        Dir["#{__dir__}/devtools/v#{closest_version}/*"].sort.each do |f|
-          require f
+        self.class.class_eval do
+          define_method(method) do
+            Object.const_get(desired_class).new(self)
+          end
         end
+
+        send(method)
+      end
+
+      def respond_to_missing?(method, *_args)
+        desired_class = "Selenium::DevTools::V#{Selenium::DevTools.version}::#{method.capitalize}"
+        Object.const_defined?(desired_class)
       end
 
+      private
+
       def process_handshake
         socket.print(ws.to_s)
         ws << socket.readpartial(1024)
@@ -89,7 +98,8 @@ module Selenium
               next unless message['method']
 
               callbacks[message['method']].each do |callback|
-                Thread.new { callback.call(message['params']) }
+                params = message['params'] # take in current thread!
+                Thread.new { callback.call(params) }
               end
             end
           end
@@ -97,6 +107,13 @@ module Selenium
         socket_listener.abort_on_exception = true
       end
 
+      def start_session
+        targets = target.get_targets.dig('result', 'targetInfos')
+        page_target = targets.find { |target| target['type'] == 'page' }
+        session = target.attach_to_target(target_id: page_target['targetId'], flatten: true)
+        @session_id = session.dig('result', 'sessionId')
+      end
+
       def incoming_frame
         @incoming_frame ||= WebSocket::Frame::Incoming::Client.new(version: ws.version)
       end
@@ -110,15 +127,7 @@ module Selenium
       end
 
       def ws
-        @ws ||= WebSocket::Handshake::Client.new(url: page_target['webSocketDebuggerUrl'])
-      end
-
-      def page_target
-        @page_target ||= begin
-          response = Net::HTTP.get(@uri.hostname, '/json/list', @uri.port)
-          targets = JSON.parse(response)
-          targets.find { |target| target['type'] == 'page' }
-        end
+        @ws ||= WebSocket::Handshake::Client.new(url: @url)
       end
 
       def next_id

data/lib/selenium/webdriver/devtools/{v87/console.rb → request.rb}

@@ -17,43 +17,41 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# This file is automatically generated. Any changes will be lost!
 module Selenium
   module WebDriver
     class DevTools
-      def console
-        @console ||= V87::Console.new(self)
-      end
-
-      module V87
-        class Console
-          EVENTS = {
-            message_added: 'messageAdded'
-          }.freeze
-
-          def initialize(devtools)
-            @devtools = devtools
-          end
-
-          def on(event, &block)
-            event = EVENTS[event] if event.is_a?(Symbol)
-            @devtools.callbacks["Console.#{event}"] << block
-          end
-
-          def clear_messages
-            @devtools.send_cmd('Console.clearMessages')
-          end
-
-          def disable
-            @devtools.send_cmd('Console.disable')
-          end
-
-          def enable
-            @devtools.send_cmd('Console.enable')
-          end
-
-        end # V87
-      end # Console
+      class Request
+
+        attr_reader :url, :method, :headers
+
+        def initialize(devtools:, id:, url:, method:, headers:)
+          @devtools = devtools
+          @id = id
+          @url = url
+          @method = method
+          @headers = headers
+        end
+
+        def continue
+          @devtools.fetch.continue_request(request_id: @id)
+        end
+
+        def respond(code: 200, headers: {}, body: '')
+          @devtools.fetch.fulfill_request(
+            request_id: @id,
+            body: Base64.strict_encode64(body),
+            response_code: code,
+            response_headers: headers.map do |k, v|
+              {name: k, value: v}
+            end
+          )
+        end
+
+        def inspect
+          %(#<#{self.class.name} @method="#{method}" @url="#{url}")
+        end
+
+      end # Request
     end # DevTools
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/edge.rb

@@ -22,7 +22,7 @@ require 'net/http'
 module Selenium
   module WebDriver
     module Edge
-      autoload :Bridge, 'selenium/webdriver/edge/bridge'
+      autoload :Features, 'selenium/webdriver/edge/features'
       autoload :Driver, 'selenium/webdriver/edge/driver'
       autoload :Profile, 'selenium/webdriver/edge/profile'
       autoload :Options, 'selenium/webdriver/edge/options'

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

@@ -33,14 +33,10 @@ module Selenium
           :edge
         end
 
-        def bridge_class
-          Bridge
-        end
-
         private
 
-        def debugger_address
-          capabilities['ms:edgeOptions']['debuggerAddress']
+        def devtools_address
+          "http://#{capabilities['ms:edgeOptions']['debuggerAddress']}"
         end
       end # Driver
     end # Edge

data/lib/selenium/webdriver/firefox.rb

@@ -27,7 +27,7 @@ module Selenium
       autoload :Extension, 'selenium/webdriver/firefox/extension'
       autoload :ProfilesIni, 'selenium/webdriver/firefox/profiles_ini'
       autoload :Profile, 'selenium/webdriver/firefox/profile'
-      autoload :Bridge, 'selenium/webdriver/firefox/bridge'
+      autoload :Features, 'selenium/webdriver/firefox/features'
       autoload :Driver, 'selenium/webdriver/firefox/driver'
       autoload :Options, 'selenium/webdriver/firefox/options'
       autoload :Service, 'selenium/webdriver/firefox/service'
@@ -38,6 +38,10 @@ module Selenium
       DEFAULT_ASSUME_UNTRUSTED_ISSUER = true
       DEFAULT_LOAD_NO_FOCUS_LIB = false
 
+      # Mozilla Automation Team asked to only support 85
+      # until WebDriver Bidi is available.
+      DEVTOOLS_VERSION = 85
+
       def self.driver_path=(path)
         WebDriver.logger.deprecate 'Selenium::WebDriver::Firefox#driver_path=',
                                    'Selenium::WebDriver::Firefox::Service#driver_path=',

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

@@ -27,28 +27,21 @@ module Selenium
       #
 
       class Driver < WebDriver::Driver
-        include DriverExtensions::HasAddons
-        include DriverExtensions::HasDevTools
-        include DriverExtensions::HasLogEvents
-        include DriverExtensions::HasWebStorage
-        include DriverExtensions::PrintsPage
+        EXTENSIONS = [DriverExtensions::HasAddons,
+                      DriverExtensions::HasDevTools,
+                      DriverExtensions::HasLogEvents,
+                      DriverExtensions::HasNetworkInterception,
+                      DriverExtensions::HasWebStorage,
+                      DriverExtensions::PrintsPage].freeze
 
         def browser
           :firefox
         end
 
-        def bridge_class
-          Bridge
-        end
-
         private
 
-        def devtools_version
-          85
-        end
-
-        def debugger_address
-          capabilities['moz:debuggerAddress']
+        def devtools_address
+          "http://#{capabilities['moz:debuggerAddress']}"
         end
       end # Driver
     end # Firefox

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

@@ -28,7 +28,7 @@ module Selenium
       #
 
       class Driver < WebDriver::Driver
-        include DriverExtensions::HasWebStorage
+        EXTENSIONS = [DriverExtensions::HasWebStorage].freeze
 
         def browser
           :internet_explorer

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

@@ -38,7 +38,9 @@ module Selenium
           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)
-          driver_args << "--implementation=#{driver_opts[:implementation].to_s.upcase}" if driver_opts.key?(:implementation)
+          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

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

@@ -57,6 +57,17 @@ module Selenium
           raise Error::WebDriverError, 'no sessionId in returned payload' unless @session_id
 
           @capabilities = Capabilities.json_create(capabilities)
+
+          case @capabilities[:browser_name]
+          when 'chrome'
+            extend(WebDriver::Chrome::Features)
+          when 'firefox'
+            extend(WebDriver::Firefox::Features)
+          when 'msedge'
+            extend(WebDriver::Edge::Features)
+          when 'Safari', 'Safari Technology Preview'
+            extend(WebDriver::Safari::Features)
+          end
         end
 
         #
@@ -70,7 +81,7 @@ module Selenium
         def browser
           @browser ||= begin
             name = @capabilities.browser_name
-            name ? name.tr(' ', '_').to_sym : 'unknown'
+            name ? name.tr(' ', '_').downcase.to_sym : 'unknown'
           end
         end
 
@@ -207,7 +218,10 @@ module Selenium
         end
 
         def window_size(handle = :current)
-          raise Error::UnsupportedOperationError, 'Switch to desired window before getting its size' unless handle == :current
+          unless handle == :current
+            raise Error::UnsupportedOperationError,
+                  'Switch to desired window before getting its size'
+          end
 
           data = execute :get_window_rect
           Dimension.new data['width'], data['height']
@@ -218,7 +232,10 @@ module Selenium
         end
 
         def maximize_window(handle = :current)
-          raise Error::UnsupportedOperationError, 'Switch to desired window before changing its size' unless handle == :current
+          unless handle == :current
+            raise Error::UnsupportedOperationError,
+                  'Switch to desired window before changing its size'
+          end
 
           execute :maximize_window
         end
@@ -433,6 +450,10 @@ module Selenium
           execute_atom :getAttribute, element, name
         end
 
+        def element_dom_attribute(element, name)
+          execute :get_element_attribute, id: element.ref, name: name
+        end
+
         def element_property(element, name)
           execute :get_element_property, id: element.ref, name: name
         end

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

@@ -86,6 +86,7 @@ module Selenium
               browser_name: 'MicrosoftEdge'
             }.merge(opts))
           end
+          alias_method :microsoftedge, :edge
 
           def firefox(opts = {})
             opts[:browser_version] = opts.delete(:version) if opts.key?(:version)
@@ -128,11 +129,10 @@ module Selenium
             data = data.dup
 
             caps = new
-            caps.browser_name = data.delete('browserName') if data.key?('browserName')
-            caps.browser_version = data.delete('browserVersion') if data.key?('browserVersion')
-            caps.platform_name = data.delete('platformName') if data.key?('platformName')
-            caps.accept_insecure_certs = data.delete('acceptInsecureCerts') if data.key?('acceptInsecureCerts')
-            caps.page_load_strategy = data.delete('pageLoadStrategy') if data.key?('pageLoadStrategy')
+            (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'))
 
@@ -142,7 +142,9 @@ module Selenium
             end
 
             # Remote Server Specific
-            caps[:remote_session_id] = data.delete('webdriver.remote.sessionid') if data.key?('webdriver.remote.sessionid')
+            if data.key?('webdriver.remote.sessionid')
+              caps[:remote_session_id] = data.delete('webdriver.remote.sessionid')
+            end
 
             # any remaining pairs will be added as is, with no conversion
             caps.merge!(data)
@@ -150,6 +152,10 @@ module Selenium
             caps
           end
 
+          def camel_case(str_or_sym)
+            str_or_sym.to_s.gsub(/_([a-z])/) { Regexp.last_match(1).upcase }
+          end
+
           private
 
           def process_timeouts(caps, timeouts)
@@ -222,15 +228,15 @@ module Selenium
             when :platform
               hash['platform'] = value.to_s.upcase
             when :proxy
-              if value
-                hash['proxy'] = value.as_json
-                hash['proxy']['proxyType'] &&= hash['proxy']['proxyType'].downcase
-                hash['proxy']['noProxy'] = hash['proxy']['noProxy'].split(', ') if hash['proxy']['noProxy'].is_a?(String)
-              end
+              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[camel_case(key.to_s)] = value
+              hash[self.class.camel_case(key)] = value
             else
               raise TypeError, "expected String or Symbol, got #{key.inspect}:#{key.class} / #{value.inspect}"
             end
@@ -257,10 +263,14 @@ module Selenium
 
         private
 
-        def camel_case(str)
-          str.gsub(/_([a-z])/) { Regexp.last_match(1).upcase }
-        end
+        def process_proxy(hash, value)
+          hash['proxy'] = value.as_json
+          hash['proxy']['proxyType'] &&= hash['proxy']['proxyType'].downcase
 
+          return unless hash['proxy']['noProxy'].is_a?(String)
+
+          hash['proxy']['noProxy'] = hash['proxy']['noProxy'].split(', ')
+        end
       end # Capabilities
     end # Remote
   end # WebDriver