selenium-webdriver 4.0.0.alpha4 → 4.0.0.beta2

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

@@ -82,21 +82,11 @@ module Selenium
           end
 
           def edge(opts = {})
-            edge_html(opts)
-          end
-
-          def edge_html(opts = {})
-            new({
-              browser_name: 'MicrosoftEdge',
-              platform_name: :windows
-            }.merge(opts))
-          end
-
-          def edge_chrome(opts = {})
             new({
               browser_name: 'MicrosoftEdge'
             }.merge(opts))
           end
+          alias_method :microsoftedge, :edge
 
           def firefox(opts = {})
             opts[:browser_version] = opts.delete(:version) if opts.key?(:version)
@@ -113,8 +103,7 @@ module Selenium
 
           def safari(opts = {})
             new({
-              browser_name: 'safari',
-              platform_name: :mac
+              browser_name: Selenium::WebDriver::Safari.technology_preview? ? "Safari Technology Preview" : 'safari'
             }.merge(opts))
           end
 
@@ -140,32 +129,42 @@ 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')
-
-            if data.key?('timeouts')
-              timeouts = data.delete('timeouts')
-              caps.implicit_timeout = timeouts['implicit'] if timeouts
-              caps.page_load_timeout = timeouts['pageLoad'] if timeouts
-              caps.script_timeout = timeouts['script'] if timeouts
+            (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'))
+
             if data.key?('proxy')
               proxy = data.delete('proxy')
               caps.proxy = Proxy.json_create(proxy) unless proxy.nil? || proxy.empty?
             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)
 
             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)
+            return if timeouts.nil?
+
+            caps.implicit_timeout = timeouts['implicit']
+            caps.page_load_timeout = timeouts['pageLoad']
+            caps.script_timeout = timeouts['script']
+          end
         end
 
         #
@@ -229,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
@@ -264,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

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

@@ -117,6 +117,7 @@ module Selenium
 
           actions: [:post, 'session/:session_id/actions'],
           release_actions: [:delete, 'session/:session_id/actions'],
+          print_page: [:post, 'session/:session_id/print'],
 
           #
           # Element Operations

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

@@ -28,11 +28,8 @@ module Selenium
 
       class Driver < WebDriver::Driver
         include DriverExtensions::UploadsFiles
-        include DriverExtensions::TakesScreenshot
         include DriverExtensions::HasSessionId
-        include DriverExtensions::Rotatable
         include DriverExtensions::HasRemoteStatus
-        include DriverExtensions::HasWebStorage
 
         def initialize(bridge: nil, listener: nil, **opts)
           desired_capabilities = opts[:desired_capabilities]
@@ -46,6 +43,18 @@ module Selenium
           opts[:url] ||= "http://#{Platform.localhost}:4444/wd/hub"
           super
         end
+
+        def print_page(**options)
+          options[:page_ranges] &&= Array(options[:page_ranges])
+
+          @bridge.print_page(options)
+        end
+
+        private
+
+        def devtools_address
+          capabilities['se:cdp']
+        end
       end # Driver
     end # Remote
   end # WebDriver

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

@@ -30,13 +30,8 @@ module Selenium
             'User-Agent' => "selenium/#{WebDriver::VERSION} (ruby #{Platform.os})"
           }.freeze
 
-          attr_accessor :timeout
           attr_writer :server_url
 
-          def initialize
-            @timeout = nil
-          end
-
           def quit_errors
             [IOError]
           end

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

@@ -28,8 +28,7 @@ module Selenium
         class Default < Common
           attr_writer :proxy
 
-          attr_accessor :open_timeout
-          attr_accessor :read_timeout
+          attr_accessor :open_timeout, :read_timeout
 
           # Initializes object.
           # Warning: Setting {#open_timeout} to non-nil values will cause a separate thread to spawn.
@@ -39,6 +38,7 @@ module Selenium
           def initialize(open_timeout: nil, read_timeout: nil)
             @open_timeout = open_timeout
             @read_timeout = read_timeout
+            super()
           end
 
           def close
@@ -55,8 +55,7 @@ module Selenium
                 http.verify_mode = OpenSSL::SSL::VERIFY_NONE
               end
 
-              # Defaulting open_timeout to nil to be consistent with Ruby 2.2 and earlier.
-              http.open_timeout = open_timeout
+              http.open_timeout = open_timeout if open_timeout
               http.read_timeout = read_timeout if read_timeout
 
               start(http)
@@ -128,12 +127,14 @@ module Selenium
           def new_http_client
             if use_proxy?
               url = @proxy.http
-              raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}" unless proxy.respond_to?(:http) && url
+              unless proxy.respond_to?(:http) && url
+                raise Error::WebDriverError,
+                      "expected HTTP proxy, got #{@proxy.inspect}"
+              end
 
               proxy = URI.parse(url)
 
-              clazz = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password)
-              clazz.new(server_url.host, server_url.port)
+              Net::HTTP.new(server_url.host, server_url.port, proxy.host, proxy.port, proxy.user, proxy.password)
             else
               Net::HTTP.new server_url.host, server_url.port
             end

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

@@ -25,6 +25,12 @@ module Selenium
       module Http
         # @api private
         class Persistent < Default
+          def initialize(open_timeout: nil, read_timeout: nil)
+            WebDriver.logger.deprecate("Selenium::WebDriver::Remote::Http::Persistent",
+                                       id: :http_persistent) { "The default HTTP client now uses persistence." }
+            super
+          end
+
           def close
             @http&.shutdown
           end

data/lib/selenium/webdriver/safari.rb

@@ -20,18 +20,25 @@
 module Selenium
   module WebDriver
     module Safari
-      autoload :Bridge, 'selenium/webdriver/safari/bridge'
+      autoload :Features, 'selenium/webdriver/safari/features'
       autoload :Driver, 'selenium/webdriver/safari/driver'
       autoload :Options, 'selenium/webdriver/safari/options'
       autoload :Service, 'selenium/webdriver/safari/service'
 
       class << self
+        attr_accessor :use_technology_preview
+
         def technology_preview
           "/Applications/Safari\ Technology\ Preview.app/Contents/MacOS/safaridriver"
         end
 
         def technology_preview!
           Service.driver_path = technology_preview
+          @use_technology_preview = true
+        end
+
+        def technology_preview?
+          use_technology_preview
         end
 
         def path=(path)

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

@@ -27,10 +27,9 @@ module Selenium
       #
 
       class Driver < WebDriver::Driver
-        include DriverExtensions::HasDebugger
-        include DriverExtensions::HasPermissions
-        include DriverExtensions::HasWebStorage
-        include DriverExtensions::TakesScreenshot
+        EXTENSIONS = [DriverExtensions::HasDebugger,
+                      DriverExtensions::HasPermissions,
+                      DriverExtensions::HasWebStorage].freeze
 
         def browser
           :safari

data/lib/selenium/webdriver/safari/{bridge.rb → features.rb}

@@ -20,17 +20,17 @@
 module Selenium
   module WebDriver
     module Safari
-      module Bridge
+      module Features
 
         # https://developer.apple.com/library/content/documentation/NetworkingInternetWeb/Conceptual/WebDriverEndpointDoc/Commands/Commands.html
-        COMMANDS = {
+        SAFARI_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']
         }.freeze
 
         def commands(command)
-          COMMANDS[command] || super
+          SAFARI_COMMANDS[command] || self.class::COMMANDS[command]
         end
 
         def permissions

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

@@ -26,40 +26,8 @@ module Selenium
         # @see https://developer.apple.com/documentation/webkit/about_webdriver_for_safari
         CAPABILITIES = {automatic_inspection: 'safari:automaticInspection',
                         automatic_profiling: 'safari:automaticProfiling'}.freeze
+        BROWSER = 'safari'
 
-        CAPABILITIES.each_key do |key|
-          define_method key do
-            @options[key]
-          end
-
-          define_method "#{key}=" do |value|
-            @options[key] = value
-          end
-        end
-
-        #
-        # Create a new Options instance for W3C-capable versions of Safari.
-        #
-        # @example
-        #   options = Selenium::WebDriver::Safari::Options.new(automatic_inspection: true)
-        #   driver = Selenium::WebDriver.for :safari, options: options
-        #
-        # @param [Hash] opts the pre-defined options to create the Safari::Options with
-        # @option opts [Boolean] :automatic_inspection Preloads Web Inspector and JavaScript debugger. Default is false
-        # @option opts [Boolean] :automatic_profiling Preloads Web Inspector and starts a timeline recording. Default is false
-        #
-
-        def initialize(**opts)
-          super
-        end
-
-        #
-        # @api private
-        #
-
-        def as_json(*)
-          generate_as_json(super)
-        end
       end # Options
     end # Safari
   end # WebDriver

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

@@ -25,7 +25,7 @@ module Selenium
           @callback = callback
         end
 
-        def method_missing(meth, *args) # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
+        def method_missing(meth, *args) # rubocop:disable Style/MissingRespondToMissing
           @callback.call meth, *args
         end
       end # BlockEventListener

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

@@ -72,7 +72,7 @@ module Selenium
           end
         end
 
-        def self.from_hsl(h, s, l, a) # rubocop:disable Naming/UncommunicativeMethodParamName
+        def self.from_hsl(h, s, l, a) # rubocop:disable Naming/MethodParameterName
           h = Float(h) / 360
           s = Float(s) / 100
           l = Float(l) / 100
@@ -138,7 +138,7 @@ module Selenium
         end
 
         def hex
-          format '#%02x%02x%02x', red, green, blue
+          format '#%<red>02x%<green>02x%<blue>02x', red: red, green: green, blue: blue
         end
       end # Color
     end # Support

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

@@ -120,7 +120,7 @@ module Selenium
           returned
         end
 
-        def method_missing(meth, *args, &blk) # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
+        def method_missing(meth, *args, &blk) # rubocop:disable Style/MissingRespondToMissing
           @delegate.__send__(meth, *args, &blk)
         end
       end # EventFiringBridge

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

@@ -0,0 +1,95 @@
+# 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.
+
+require_relative 'guards/guard_condition'
+require_relative 'guards/guard'
+
+module Selenium
+  module WebDriver
+    module Support
+      class Guards
+        GUARD_TYPES = %i[except only exclude exclusive].freeze
+
+        attr_reader :messages
+        attr_accessor :bug_tracker
+
+        def initialize(example, bug_tracker: '', conditions: nil)
+          @example = example
+          @bug_tracker = bug_tracker
+          @guard_conditions = conditions || []
+          @guards = collect_example_guards
+          @messages = {}
+        end
+
+        def add_condition(name, condition = nil, &blk)
+          @guard_conditions << GuardCondition.new(name, condition, &blk)
+        end
+
+        def add_message(name, message)
+          @messages[name] = message
+        end
+
+        def disposition
+          if !skipping_guard.nil?
+            [:skip, skipping_guard.message]
+          elsif !pending_guard.nil? && ENV['SKIP_PENDING']
+            [:skip, pending_guard.message]
+          elsif !pending_guard.nil?
+            [:pending, pending_guard.message]
+          end
+        end
+
+        def satisfied?(guard)
+          @guard_conditions.all? { |condition| condition.satisfied?(guard) }
+        end
+
+        private
+
+        def collect_example_guards
+          guards = []
+
+          GUARD_TYPES.each do |guard_type|
+            example_group = @example.metadata[:example_group]
+            example_guards = [@example.metadata[guard_type], example_group[guard_type]]
+            while example_group[:parent_example_group]
+              example_group = example_group[:parent_example_group]
+              example_guards << example_group[guard_type]
+            end
+
+            example_guards.flatten.uniq.compact.each do |example_guard|
+              guards << Guard.new(example_guard, guard_type, self)
+            end
+          end
+
+          guards
+        end
+
+        def skipping_guard
+          @guards.select(&:exclusive?).find { |guard| !satisfied?(guard) } ||
+            @guards.select(&:exclude?).find { |guard| satisfied?(guard) }
+        end
+
+        def pending_guard
+          @guards.select(&:except?).find { |guard| satisfied?(guard) } ||
+            @guards.select(&:only?).find { |guard| !satisfied?(guard) }
+        end
+      end # Guards
+    end # Support
+  end # WebDriver
+end # Selenium