selenium-webdriver 4.0.0.alpha7 → 4.0.0.beta1

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

@@ -32,7 +32,7 @@ module Selenium
 
         private
 
-        # Note: This processing is deprecated
+        # NOTE: This processing is deprecated
         def extract_service_args(driver_opts)
           driver_args = super
           driver_opts = driver_opts.dup

data/lib/selenium/webdriver/common.rb

@@ -50,7 +50,6 @@ require 'selenium/webdriver/common/action_builder'
 require 'selenium/webdriver/common/html5/shared_web_storage'
 require 'selenium/webdriver/common/html5/local_storage'
 require 'selenium/webdriver/common/html5/session_storage'
-require 'selenium/webdriver/common/driver_extensions/rotatable'
 require 'selenium/webdriver/common/driver_extensions/has_web_storage'
 require 'selenium/webdriver/common/driver_extensions/downloads_files'
 require 'selenium/webdriver/common/driver_extensions/has_location'
@@ -60,10 +59,12 @@ require 'selenium/webdriver/common/driver_extensions/has_network_conditions'
 require 'selenium/webdriver/common/driver_extensions/has_network_connection'
 require 'selenium/webdriver/common/driver_extensions/has_permissions'
 require 'selenium/webdriver/common/driver_extensions/has_debugger'
+require 'selenium/webdriver/common/driver_extensions/prints_page'
 require 'selenium/webdriver/common/driver_extensions/uploads_files'
 require 'selenium/webdriver/common/driver_extensions/has_addons'
 require 'selenium/webdriver/common/driver_extensions/has_devtools'
 require 'selenium/webdriver/common/driver_extensions/has_authentication'
+require 'selenium/webdriver/common/driver_extensions/has_logs'
 require 'selenium/webdriver/common/driver_extensions/has_log_events'
 require 'selenium/webdriver/common/keys'
 require 'selenium/webdriver/common/profile_helper'

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

@@ -53,10 +53,6 @@ module Selenium
             Firefox::Driver.new(**opts)
           when :edge
             Edge::Driver.new(**opts)
-          when :edge_chrome
-            EdgeChrome::Driver.new(**opts)
-          when :edge_html
-            EdgeHtml::Driver.new(**opts)
           when :remote
             Remote::Driver.new(**opts)
           else
@@ -82,6 +78,16 @@ module Selenium
         format '#<%<class>s:0x%<hash>x browser=%<browser>s>', class: self.class, hash: hash * 2, browser: bridge.browser.inspect
       end
 
+      #
+      # information about whether a remote end is in a state in which it can create new sessions,
+      # and may include additional meta information.
+      #
+      # @return [Hash]
+      #
+      def status
+        @bridge.status
+      end
+
       #
       # @return [Navigation]
       # @see Navigation
@@ -298,7 +304,7 @@ module Selenium
       def create_bridge(**opts)
         opts[:url] ||= service_url(opts)
         caps = opts.delete(:capabilities)
-        # Note: This is deprecated
+        # NOTE: This is deprecated
         cap_array = caps.is_a?(Hash) ? [caps] : Array(caps)
 
         desired_capabilities = opts.delete(:desired_capabilities)

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

@@ -29,8 +29,7 @@ module Selenium
         #
 
         def devtools
-          version = Integer(capabilities.browser_version.split('.').first)
-          @devtools ||= DevTools.new(url: debugger_address, version: version)
+          @devtools ||= DevTools.new(url: debugger_address, version: devtools_version)
         end
 
       end # HasDevTools

data/lib/selenium/webdriver/common/driver_extensions/has_location.rb

@@ -17,23 +17,20 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# TODO: Deprecated; Delete after 4.0 release
 module Selenium
   module WebDriver
     module DriverExtensions
       module HasLocation
         def location
-          @bridge.location
+          raise Error::UnsupportedOperationError, 'The W3C standard does not currently support getting location'
         end
 
-        def location=(loc)
-          raise TypeError, "expected #{Location}, got #{loc.inspect}:#{loc.class}" unless loc.is_a?(Location)
-
-          @bridge.set_location loc.latitude, loc.longitude, loc.altitude
+        def location=(*)
+          raise Error::UnsupportedOperationError, 'The W3C standard does not currently support setting location'
         end
+        alias_method :set_location, :location
 
-        def set_location(lat, lon, alt)
-          self.location = Location.new(Float(lat), Float(lon), Float(alt))
-        end
       end # HasLocation
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/driver_extensions/has_log_events.rb

@@ -89,8 +89,14 @@ module Selenium
 
         def log_exception_events
           devtools.runtime.on(:exception_thrown) do |params|
+            description = if params.dig('exceptionDetails', 'exception')
+                            params.dig('exceptionDetails', 'exception', 'description')
+                          else
+                            params.dig('exceptionDetails', 'text')
+                          end
+
             event = DevTools::ExceptionEvent.new(
-              description: params.dig('exceptionDetails', 'exception', 'description'),
+              description: description,
               timestamp: params['timestamp'],
               stacktrace: params.dig('exceptionDetails', 'stackTrace', 'callFrames')
             )

data/lib/selenium/webdriver/common/driver_extensions/has_logs.rb

@@ -0,0 +1,30 @@
+# 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
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    module DriverExtensions
+      module HasLogs
+        def logs
+          @logs ||= Logs.new(@bridge)
+        end
+      end # HasLogs
+    end # DriverExtensions
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/common/driver_extensions/has_network_connection.rb

@@ -17,40 +17,17 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# TODO: Deprecated; Delete after 4.0 release
 module Selenium
   module WebDriver
     module DriverExtensions
       module HasNetworkConnection
         def network_connection_type
-          connection_value = @bridge.network_connection
-
-          connection_type = values_to_type[connection_value]
-
-          # In case the connection type is not recognized return the
-          # connection value.
-          connection_type || connection_value
-        end
-
-        def network_connection_type=(connection_type)
-          raise ArgumentError, 'Invalid connection type' unless valid_type? connection_type
-
-          connection_value = type_to_values[connection_type]
-
-          @bridge.network_connection = connection_value
-        end
-
-        private
-
-        def type_to_values
-          {airplane_mode: 1, wifi: 2, data: 4, all: 6, none: 0}
-        end
-
-        def values_to_type
-          type_to_values.invert
+          raise Error::UnsupportedOperationError, 'The W3C standard does not currently support getting network connection'
         end
 
-        def valid_type?(type)
-          type_to_values.key? type
+        def network_connection_type=(*)
+          raise Error::UnsupportedOperationError, 'The W3C standard does not currently support setting network connection'
         end
       end # HasNetworkConnection
     end # DriverExtensions

data/lib/selenium/webdriver/common/driver_extensions/has_remote_status.rb

@@ -22,6 +22,7 @@ module Selenium
     module DriverExtensions
       module HasRemoteStatus
         def remote_status
+          WebDriver.logger.deprecate('#remote_status', '#status')
           @bridge.status
         end
       end # HasRemoteStatus

data/lib/selenium/webdriver/{edge_html/driver.rb → common/driver_extensions/prints_page.rb}

@@ -19,20 +19,14 @@
 
 module Selenium
   module WebDriver
-    module EdgeHtml
+    module DriverExtensions
+      module PrintsPage
+        def print_page(**options)
+          options[:page_ranges] &&= Array(options[:page_ranges])
 
-      #
-      # Driver implementation for Microsoft Edge.
-      # @api private
-      #
-
-      class Driver < WebDriver::Driver
-        include DriverExtensions::HasWebStorage
-
-        def browser
-          :edge_html
+          @bridge.print_page(options)
         end
-      end # Driver
-    end # EdgeHtml
+      end # PrintsPage
+    end # DriverExtensions
   end # WebDriver
 end # Selenium

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

@@ -46,12 +46,15 @@ module Selenium
         raise ArgumentError, 'name is required' unless opts[:name]
         raise ArgumentError, 'value is required' unless opts[:value]
 
-        opts[:path] ||= '/'
+        # NOTE: This is required because of https://bugs.chromium.org/p/chromedriver/issues/detail?id=3732
         opts[:secure] ||= false
 
         same_site = opts.delete(:same_site)
         opts[:sameSite] = same_site if same_site
 
+        http_only = opts.delete(:http_only)
+        opts[:httpOnly] = http_only if http_only
+
         obj = opts.delete(:expires)
         opts[:expiry] = seconds_from(obj).to_i if obj
 
@@ -106,6 +109,7 @@ module Selenium
       #
 
       def logs
+        WebDriver.logger.deprecate('Manager#logs', 'Chrome::Driver#logs')
         @logs ||= Logs.new(@bridge)
       end
 
@@ -174,6 +178,7 @@ module Selenium
           domain: cookie['domain'] && strip_port(cookie['domain']),
           expires: cookie['expiry'] && datetime_at(cookie['expiry']),
           same_site: cookie['sameSite'],
+          http_only: cookie['httpOnly'],
           secure: cookie['secure']
         }
       end

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

@@ -23,19 +23,25 @@ module Selenium
       W3C_OPTIONS = %i[browser_name browser_version platform_name accept_insecure_certs page_load_strategy proxy
                        set_window_rect timeouts unhandled_prompt_behavior strict_file_interactability].freeze
 
-      W3C_OPTIONS.each do |key|
-        define_method key do
-          @options[key]
-        end
+      def self.set_capabilities
+        (W3C_OPTIONS + self::CAPABILITIES.keys).each do |key|
+          next if method_defined? key
+
+          define_method key do
+            @options[key]
+          end
 
-        define_method "#{key}=" do |value|
-          @options[key] = value
+          define_method "#{key}=" do |value|
+            @options[key] = value
+          end
         end
       end
 
       attr_accessor :options
 
       def initialize(options: nil, **opts)
+        self.class.set_capabilities
+
         @options = if options
                      WebDriver.logger.deprecate(":options as keyword for initializing #{self.class}",
                                                 "custom values directly in #new constructor",
@@ -78,16 +84,27 @@ module Selenium
         end
         browser_options = defined?(self.class::KEY) ? {self.class::KEY => options} : options
 
-        process_browser_options(browser_options) if private_methods(false).include?(:process_browser_options)
+        process_browser_options(browser_options)
         generate_as_json(w3c_options.merge(browser_options))
       end
 
       private
 
+      def process_browser_options(_browser_options)
+        nil
+      end
+
+      def camelize?(_key)
+        true
+      end
+
       def generate_as_json(value, camelize_keys: true)
         if value.is_a?(Hash)
           value.each_with_object({}) do |(key, val), hash|
-            hash[convert_json_key(key, camelize: camelize_keys)] = generate_as_json(val, camelize_keys: camelize_keys)
+            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
         elsif value.respond_to?(:as_json)
           value.as_json

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

@@ -57,6 +57,8 @@ module Selenium
           :jenkins
         elsif ENV['APPVEYOR']
           :appveyor
+        elsif ENV['GITHUB_ACTIONS']
+          :github
         end
       end
 

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

@@ -45,14 +45,6 @@ module Selenium
           Edge::Service.new(**opts)
         end
 
-        def edge_chrome(**opts)
-          EdgeChrome::Service.new(**opts)
-        end
-
-        def edge_html(**opts)
-          EdgeHtml::Service.new(**opts)
-        end
-
         def safari(**opts)
           Safari::Service.new(**opts)
         end

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

@@ -103,7 +103,7 @@ module Selenium
 
       def start_process
         @process = build_process(@executable_path, "--port=#{@port}", *@extra_args)
-        # Note: this is a bug only in Windows 7
+        # NOTE: this is a bug only in Windows 7
         @process.leader = true unless Platform.windows?
         @process.start
       end

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

@@ -57,10 +57,10 @@ module Selenium
       def window(id)
         if block_given?
           original = begin
-                       @bridge.window_handle
-                     rescue Error::NoSuchWindowError
-                       nil
-                     end
+            @bridge.window_handle
+          rescue Error::NoSuchWindowError
+            nil
+          end
 
           unless @bridge.window_handles.include? id
             raise Error::NoSuchWindowError, "The specified identifier '#{id}' is not found in the window handle list"

data/lib/selenium/webdriver/devtools.rb

@@ -24,7 +24,7 @@ module Selenium
       autoload :ExceptionEvent, 'selenium/webdriver/devtools/exception_event'
       autoload :MutationEvent, 'selenium/webdriver/devtools/mutation_event'
 
-      SUPPORTED_VERSIONS = [84, 85, 86].freeze
+      SUPPORTED_VERSIONS = [85, 86, 87, 88].freeze
 
       def initialize(url:, version:)
         @messages = []
@@ -80,6 +80,9 @@ module Selenium
             incoming_frame << socket.readpartial(1024)
 
             while (frame = incoming_frame.next)
+              # Firefox will periodically fail on unparsable empty frame
+              break if frame.to_s.empty?
+
               message = JSON.parse(frame.to_s)
               @messages << message
               WebDriver.logger.debug "DevTools <- #{message}"
@@ -112,7 +115,7 @@ module Selenium
 
       def page_target
         @page_target ||= begin
-          response = Net::HTTP.get(@uri.hostname, '/json', @uri.port)
+          response = Net::HTTP.get(@uri.hostname, '/json/list', @uri.port)
           targets = JSON.parse(response)
           targets.find { |target| target['type'] == 'page' }
         end

data/lib/selenium/webdriver/devtools/v85/memory.rb

@@ -45,7 +45,7 @@ module Selenium
             @devtools.send_cmd('Memory.prepareForLeakDetection')
           end
 
-          def forcibly_purge_java_script_memory
+          def forcibly_purge_javascript_memory
             @devtools.send_cmd('Memory.forciblyPurgeJavaScriptMemory')
           end
 

data/lib/selenium/webdriver/devtools/v85/network.rb

@@ -165,7 +165,7 @@ module Selenium
                                isRegex: is_regex)
           end
 
-          def set_blocked_ur_ls(urls:)
+          def set_blocked_urls(urls:)
             @devtools.send_cmd('Network.setBlockedURLs',
                                urls: urls)
           end

data/lib/selenium/webdriver/devtools/v85/page.rb

@@ -166,7 +166,7 @@ module Selenium
             @devtools.send_cmd('Page.getResourceTree')
           end
 
-          def handle_java_script_dialog(accept:, prompt_text: nil)
+          def handle_javascript_dialog(accept:, prompt_text: nil)
             @devtools.send_cmd('Page.handleJavaScriptDialog',
                                accept: accept,
                                promptText: prompt_text)