selenium-webdriver 4.0.0.alpha5 → 4.0.0.alpha6

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

@@ -146,12 +146,7 @@ module Selenium
             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
-            end
+            process_timeouts(caps, data.delete('timeouts'))
 
             if data.key?('proxy')
               proxy = data.delete('proxy')
@@ -166,6 +161,16 @@ module Selenium
 
             caps
           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
 
         #

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

@@ -20,7 +20,7 @@
 module Selenium
   module WebDriver
     module Safari
-      module Bridge
+      class Bridge < WebDriver::Remote::Bridge
 
         # https://developer.apple.com/library/content/documentation/NetworkingInternetWeb/Conceptual/WebDriverEndpointDoc/Commands/Commands.html
         COMMANDS = {

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

@@ -35,6 +35,10 @@ module Selenium
         def browser
           :safari
         end
+
+        def bridge_class
+          Bridge
+        end
       end # Driver
     end # Safari
   end # WebDriver

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

@@ -26,6 +26,7 @@ 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
@@ -52,14 +53,6 @@ module Selenium
         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/cdp_client_generator.rb

@@ -0,0 +1,77 @@
+# 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 'erb'
+require 'json'
+
+module Selenium
+  module WebDriver
+    module Support
+      class CDPClientGenerator
+        DEVTOOLS_DIR = File.expand_path('../devtools', __dir__)
+        BROWSER_PROTOCOL_PATH = File.expand_path('cdp/browser_protocol.json', __dir__)
+        JS_PROTOCOL_PATH = File.expand_path('cdp/js_protocol.json', __dir__)
+        TEMPLATE_PATH = File.expand_path('cdp/domain.rb.erb', __dir__)
+
+        RESERVED_KEYWORDS = %w[end].freeze
+
+        def initialize
+          @browser_protocol = JSON.parse(File.read(BROWSER_PROTOCOL_PATH), symbolize_names: true)
+          @js_protocol = JSON.parse(File.read(JS_PROTOCOL_PATH), symbolize_names: true)
+          @template = ERB.new(File.read(TEMPLATE_PATH))
+        end
+
+        def call
+          @browser_protocol[:domains].each(&method(:process_domain))
+          @js_protocol[:domains].each(&method(:process_domain))
+        end
+
+        def process_domain(domain)
+          result = @template.result_with_hash(domain: domain, h: self)
+          filename = File.join(DEVTOOLS_DIR, "#{snake_case(domain[:domain])}.rb")
+          File.write(filename, remove_empty_lines(result))
+        end
+
+        def snake_case(string)
+          name = string.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
+          # Certain CDP parameters conflict with Ruby keywords
+          # so we prefix the name with underscore.
+          name = "_#{name}" if RESERVED_KEYWORDS.include?(name)
+
+          name
+        end
+
+        def kwargs(parameters)
+          parameters = parameters.map do |parameter|
+            if parameter[:optional]
+              "#{snake_case(parameter[:name])}: nil"
+            else
+              "#{snake_case(parameter[:name])}:"
+            end
+          end
+          parameters.join(', ')
+        end
+
+        def remove_empty_lines(string)
+          string.split("\n").reject { |l| l =~ /^\s+$/ }.join("\n")
+        end
+      end
+    end
+  end
+end

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/version.rb

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

data/selenium-webdriver.gemspec

@@ -26,7 +26,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.4')
+  s.required_ruby_version = Gem::Requirement.new('>= 2.5')
 
   s.files = Dir[root + '/**/*'].reject { |e| e =~ /ruby\.iml|build\.desc/ }.map { |e| e.sub(root + '/', '') }
   s.require_paths = ['lib']
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack', ['~> 2.0']
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', ['~> 3.0']
-  s.add_development_dependency 'rubocop', ['~> 0.73.0']
+  s.add_development_dependency 'rubocop', ['~> 0.84.0']
   s.add_development_dependency 'rubocop-performance'
   s.add_development_dependency 'rubocop-rspec'
   s.add_development_dependency 'webmock', ['~> 3.5']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha5
+  version: 4.0.0.alpha6
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 0.84.0
   name: rubocop
   prerelease: false
   type: :development
@@ -129,7 +129,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 0.84.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -259,6 +259,7 @@ files:
 - lib/selenium/webdriver/common/proxy.rb
 - lib/selenium/webdriver/common/search_context.rb
 - lib/selenium/webdriver/common/service.rb
+- lib/selenium/webdriver/common/service_manager.rb
 - lib/selenium/webdriver/common/socket_lock.rb
 - lib/selenium/webdriver/common/socket_poller.rb
 - lib/selenium/webdriver/common/target_locator.rb
@@ -266,6 +267,52 @@ files:
 - lib/selenium/webdriver/common/wait.rb
 - lib/selenium/webdriver/common/window.rb
 - lib/selenium/webdriver/common/zipper.rb
+- lib/selenium/webdriver/devtools.rb
+- lib/selenium/webdriver/devtools/accessibility.rb
+- lib/selenium/webdriver/devtools/animation.rb
+- lib/selenium/webdriver/devtools/application_cache.rb
+- lib/selenium/webdriver/devtools/audits.rb
+- lib/selenium/webdriver/devtools/background_service.rb
+- lib/selenium/webdriver/devtools/browser.rb
+- lib/selenium/webdriver/devtools/cache_storage.rb
+- lib/selenium/webdriver/devtools/cast.rb
+- lib/selenium/webdriver/devtools/console.rb
+- lib/selenium/webdriver/devtools/css.rb
+- lib/selenium/webdriver/devtools/database.rb
+- lib/selenium/webdriver/devtools/debugger.rb
+- lib/selenium/webdriver/devtools/device_orientation.rb
+- lib/selenium/webdriver/devtools/dom.rb
+- lib/selenium/webdriver/devtools/domdebugger.rb
+- lib/selenium/webdriver/devtools/domsnapshot.rb
+- lib/selenium/webdriver/devtools/domstorage.rb
+- lib/selenium/webdriver/devtools/emulation.rb
+- lib/selenium/webdriver/devtools/fetch.rb
+- lib/selenium/webdriver/devtools/headless_experimental.rb
+- lib/selenium/webdriver/devtools/heap_profiler.rb
+- lib/selenium/webdriver/devtools/indexed_db.rb
+- lib/selenium/webdriver/devtools/input.rb
+- lib/selenium/webdriver/devtools/inspector.rb
+- lib/selenium/webdriver/devtools/io.rb
+- lib/selenium/webdriver/devtools/layer_tree.rb
+- lib/selenium/webdriver/devtools/log.rb
+- lib/selenium/webdriver/devtools/media.rb
+- lib/selenium/webdriver/devtools/memory.rb
+- lib/selenium/webdriver/devtools/network.rb
+- lib/selenium/webdriver/devtools/overlay.rb
+- lib/selenium/webdriver/devtools/page.rb
+- lib/selenium/webdriver/devtools/performance.rb
+- lib/selenium/webdriver/devtools/profiler.rb
+- lib/selenium/webdriver/devtools/runtime.rb
+- lib/selenium/webdriver/devtools/schema.rb
+- lib/selenium/webdriver/devtools/security.rb
+- lib/selenium/webdriver/devtools/service_worker.rb
+- lib/selenium/webdriver/devtools/storage.rb
+- lib/selenium/webdriver/devtools/system_info.rb
+- lib/selenium/webdriver/devtools/target.rb
+- lib/selenium/webdriver/devtools/tethering.rb
+- lib/selenium/webdriver/devtools/tracing.rb
+- lib/selenium/webdriver/devtools/web_audio.rb
+- lib/selenium/webdriver/devtools/web_authn.rb
 - lib/selenium/webdriver/edge.rb
 - lib/selenium/webdriver/edge_chrome/bridge.rb
 - lib/selenium/webdriver/edge_chrome/driver.rb
@@ -306,6 +353,7 @@ files:
 - lib/selenium/webdriver/support.rb
 - lib/selenium/webdriver/support/abstract_event_listener.rb
 - lib/selenium/webdriver/support/block_event_listener.rb
+- lib/selenium/webdriver/support/cdp_client_generator.rb
 - lib/selenium/webdriver/support/color.rb
 - lib/selenium/webdriver/support/escaper.rb
 - lib/selenium/webdriver/support/event_firing_bridge.rb
@@ -327,7 +375,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"