selenium-webdriver 4.0.0.beta3 → 4.0.0.beta4

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

@@ -28,6 +28,7 @@ module Selenium
 
       class Driver < WebDriver::Driver
         EXTENSIONS = [DriverExtensions::HasAddons,
+                      DriverExtensions::FullPageScreenshot,
                       DriverExtensions::HasDevTools,
                       DriverExtensions::HasLogEvents,
                       DriverExtensions::HasNetworkInterception,

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

@@ -24,7 +24,8 @@ module Selenium
 
         FIREFOX_COMMANDS = {
           install_addon: [:post, 'session/:session_id/moz/addon/install'],
-          uninstall_addon: [:post, 'session/:session_id/moz/addon/uninstall']
+          uninstall_addon: [:post, 'session/:session_id/moz/addon/uninstall'],
+          full_page_screenshot: [:get, 'session/:session_id/moz/screenshot/full']
         }.freeze
 
         def commands(command)
@@ -41,6 +42,10 @@ module Selenium
           execute :uninstall_addon, {}, {id: id}
         end
 
+        def full_screenshot
+          execute :full_page_screenshot
+        end
+
       end # Bridge
     end # Firefox
   end # WebDriver

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

@@ -603,7 +603,7 @@ module Selenium
         end
 
         def prepare_capabilities_payload(capabilities)
-          capabilities = {firstMatch: [capabilities]} if !capabilities['alwaysMatch'] && !capabilities['firstMatch']
+          capabilities = {alwaysMatch: capabilities} if !capabilities['alwaysMatch'] && !capabilities['firstMatch']
           {capabilities: capabilities}
         end
 

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

@@ -307,23 +307,13 @@ module Selenium
           when :platform
             value.to_s.upcase
           when :proxy
-            convert_proxy(value)
+            value&.as_json
           when :unhandled_prompt_behavior
             value.is_a?(Symbol) ? value.to_s.tr('_', ' ') : value
           else
             value
           end
         end
-
-        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
   end # WebDriver

data/lib/selenium/webdriver/support/cdp/domain.rb.erb

@@ -0,0 +1,63 @@
+# 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.
+
+# This file is automatically generated. Any changes will be lost!
+module Selenium
+  module DevTools
+    module <%= version %>
+      class <%= domain[:domain] %>
+        <% if domain[:events] %>
+        EVENTS = {
+          <% domain[:events].each do |event| %>
+          <%= h.snake_case(event[:name]) %>: '<%= event[:name] %>',
+          <% end %>
+        }.freeze
+        <% end %>
+
+        def initialize(devtools)
+          @devtools = devtools
+        end
+
+        def on(event, &block)
+          event = EVENTS[event] if event.is_a?(Symbol)
+          @devtools.callbacks["<%= domain[:domain] %>.#{event}"] << block
+        end
+
+        <% domain[:commands].each do |command| %>
+        <% if command[:parameters] %>
+        def <%= h.snake_case(command[:name]) %>(<%= h.kwargs(command[:parameters]) %>)
+        <% else %>
+        def <%= h.snake_case(command[:name]) %>
+        <% end %>
+          <% if command[:parameters] %>
+          @devtools.send_cmd('<%= domain[:domain] %>.<%= command[:name] %>',
+            <% until command[:parameters].empty? %>
+              <% parameter = command[:parameters].shift %>
+                             <%= parameter[:name] %>: <%= h.snake_case(parameter[:name]) %><%= command[:parameters].empty? ? ')' : ',' %>
+            <% end %>
+          <% else %>
+          @devtools.send_cmd('<%= domain[:domain] %>.<%= command[:name] %>')
+          <% end %>
+        end
+
+        <% end %>
+      end # <%= domain[:domain] %>
+    end # <%= version %>
+  end # DevTools
+end # Selenium

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

@@ -0,0 +1,108 @@
+# 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 'fileutils'
+require 'json'
+
+module Selenium
+  module WebDriver
+    module Support
+      class CDPClientGenerator
+        # Input JSON files are generated from PDL tasks.
+        TEMPLATE_PATH = File.expand_path('cdp/domain.rb.erb', __dir__)
+
+        RESERVED_KEYWORDS = %w[end].freeze
+
+        def call(output_dir:, version:, browser_protocol_path: nil, js_protocol_path: nil, loader_path: nil, **)
+          @template = ERB.new(File.read(TEMPLATE_PATH))
+          @output_dir = output_dir
+          @loader_path = loader_path || "#{@output_dir}.rb"
+          @version = version
+
+          browser_protocol_path ||= File.expand_path('cdp/browser_protocol.json', __dir__)
+          js_protocol_path ||= File.expand_path('cdp/js_protocol.json', __dir__)
+
+          browser_protocol = JSON.parse(File.read(browser_protocol_path), symbolize_names: true)
+          js_protocol = JSON.parse(File.read(js_protocol_path), symbolize_names: true)
+
+          FileUtils.mkdir_p(@output_dir)
+
+          browser_protocol[:domains].each(&method(:process_domain))
+          js_protocol[:domains].each(&method(:process_domain))
+          require_file
+        end
+
+        def process_domain(domain)
+          result = @template.result_with_hash(domain: domain, version: @version.upcase, h: self)
+          filename = File.join(@output_dir, "#{snake_case(domain[:domain])}.rb")
+          File.write(filename, remove_empty_lines(result))
+        end
+
+        def snake_case(string)
+          name = string.gsub('JavaScript', 'Javascript')
+                       .gsub(/([A-Z]+)([A-Z][a-z]{2,})/, '\1_\2')
+                       .gsub(/([a-z\d])([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
+
+        def require_file
+          # rubocop:disable Lint/InterpolationCheck
+          dynamic_location = '#{File.dirname(File.absolute_path(__FILE__))}'
+          # rubocop:enable Lint/InterpolationCheck
+
+          require_all = "Dir.glob(\"#{dynamic_location}/#{@version}/*\", &method(:require))"
+          File.open(@loader_path, 'w') { |file| file.write(require_all) }
+        end
+      end
+    end
+  end
+end
+
+if $PROGRAM_NAME == __FILE__
+  browser_protocol_path, js_protocol_path, output_dir, loader_path, version = *ARGV
+
+  Selenium::WebDriver::Support::CDPClientGenerator.new.call(
+    browser_protocol_path: browser_protocol_path,
+    js_protocol_path: js_protocol_path,
+    output_dir: output_dir,
+    loader_path: loader_path,
+    version: version
+  )
+end

data/lib/selenium/webdriver/version.rb

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

data/selenium-webdriver.gemspec

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+root = File.expand_path(File.dirname(__FILE__))
+raise "cwd must be #{root} when reading gemspec" if root != Dir.pwd
+
+$LOAD_PATH.push(File.expand_path('lib', root))
+require 'selenium/webdriver/version'
+
+Gem::Specification.new do |s|
+  s.name = 'selenium-webdriver'
+  s.version = Selenium::WebDriver::VERSION
+
+  s.authors = ['Alex Rodionov', 'Titus Fortner', 'Thomas Walpole']
+  s.email = %w[p0deje@gmail.com titusfortner@gmail.com twalpole@gmail.com]
+
+  s.summary = 'Selenium is a browser automation tool for automated testing of webapps and more'
+  s.description = <<-DESCRIPTION
+    Selenium implements the W3C WebDriver protocol to automate popular browsers.
+    It aims to mimic the behaviour of a real user as it interacts with the application's HTML.
+    It's primarily intended for web application testing, but any web-based task can automated.
+  DESCRIPTION
+
+  s.license = 'Apache-2.0'
+  s.homepage = 'https://selenium.dev'
+  s.metadata = {
+    'changelog_uri' => 'https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES',
+    'source_code_uri' => 'https://github.com/SeleniumHQ/selenium/tree/trunk/rb'
+  }
+
+  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.5')
+
+  s.files = [
+    'CHANGES',
+    'LICENSE',
+    'NOTICE',
+    'Gemfile',
+    'README.md',
+    'selenium-webdriver.gemspec',
+    'lib/selenium-webdriver.rb',
+    'lib/selenium/server.rb',
+    'lib/selenium/webdriver.rb'
+  ] + Dir['lib/selenium/webdriver/**/*']
+
+  s.require_paths = ['lib']
+
+  s.add_runtime_dependency 'childprocess', ['>= 0.5', '< 5.0']
+  s.add_runtime_dependency 'rexml', ['~> 3.2']
+  s.add_runtime_dependency 'rubyzip', ['>= 1.2.2']
+
+  # childprocess requires ffi on windows but doesn't declare it in its dependencies
+  s.add_development_dependency 'ffi'
+  s.add_development_dependency 'rack', ['~> 2.0']
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', ['~> 3.0']
+  s.add_development_dependency 'rubocop', ['~> 1.8.0']
+  s.add_development_dependency 'rubocop-performance'
+  s.add_development_dependency 'rubocop-rspec'
+  s.add_development_dependency 'webmock', ['~> 3.5']
+  s.add_development_dependency 'webrick', ['~> 1.7']
+  s.add_development_dependency 'yard', ['~> 0.9.11']
+end

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta3
+  version: 4.0.0.beta4
 platform: ruby
 authors:
 - Alex Rodionov
 - Titus Fortner
 - Thomas Walpole
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -21,9 +22,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-  name: childprocess
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -33,182 +33,168 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-  name: rexml
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
-  name: rubyzip
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  name: websocket
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: ffi
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: rack
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
-  name: rubocop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rubocop-performance
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rubocop-rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-  name: webmock
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  name: webrick
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.11
-  name: yard
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -226,8 +212,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGES
+- Gemfile
+- LICENSE
+- NOTICE
+- README.md
 - lib/selenium-webdriver.rb
-- lib/selenium/devtools.rb
 - lib/selenium/server.rb
 - lib/selenium/webdriver.rb
 - lib/selenium/webdriver/atoms.rb
@@ -246,8 +236,10 @@ files:
 - lib/selenium/webdriver/common/alert.rb
 - lib/selenium/webdriver/common/driver.rb
 - lib/selenium/webdriver/common/driver_extensions/downloads_files.rb
+- lib/selenium/webdriver/common/driver_extensions/full_page_screenshot.rb
 - lib/selenium/webdriver/common/driver_extensions/has_addons.rb
 - lib/selenium/webdriver/common/driver_extensions/has_authentication.rb
+- lib/selenium/webdriver/common/driver_extensions/has_cdp.rb
 - lib/selenium/webdriver/common/driver_extensions/has_debugger.rb
 - lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
 - lib/selenium/webdriver/common/driver_extensions/has_location.rb
@@ -340,6 +332,8 @@ 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/domain.rb.erb
+- 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
@@ -349,13 +343,14 @@ files:
 - lib/selenium/webdriver/support/relative_locator.rb
 - lib/selenium/webdriver/support/select.rb
 - lib/selenium/webdriver/version.rb
+- selenium-webdriver.gemspec
 homepage: https://selenium.dev
 licenses:
 - Apache-2.0
 metadata:
   changelog_uri: https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES
   source_code_uri: https://github.com/SeleniumHQ/selenium/tree/trunk/rb
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -370,9 +365,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Selenium is a browser automation tool for automated testing of webapps and
   more