selenium-webdriver 4.0.0.alpha3 → 4.0.0.alpha4

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

@@ -89,15 +89,15 @@ module Selenium
               retries += 1
               sleep 2
               retry
-            rescue Errno::EADDRNOTAVAIL => ex
+            rescue Errno::EADDRNOTAVAIL => e
               # a retry is sometimes needed when the port becomes temporarily unavailable
               raise if retries >= MAX_RETRIES
 
               retries += 1
               sleep 2
               retry
-            rescue Errno::ECONNREFUSED => ex
-              raise ex.class, "using proxy: #{proxy.http}" if use_proxy?
+            rescue Errno::ECONNREFUSED => e
+              raise e.class, "using proxy: #{proxy.http}" if use_proxy?
 
               raise
             end

data/lib/selenium/webdriver/safari.rb

@@ -49,13 +49,15 @@ module Selenium
 
         def driver_path=(path)
           WebDriver.logger.deprecate 'Selenium::WebDriver::Safari#driver_path=',
-                                     'Selenium::WebDriver::Safari::Service#driver_path='
+                                     'Selenium::WebDriver::Safari::Service#driver_path=',
+                                     id: :driver_path
           Selenium::WebDriver::Safari::Service.driver_path = path
         end
 
         def driver_path
           WebDriver.logger.deprecate 'Selenium::WebDriver::Safari#driver_path',
-                                     'Selenium::WebDriver::Safari::Service#driver_path'
+                                     'Selenium::WebDriver::Safari::Service#driver_path',
+                                     id: :driver_path
           Selenium::WebDriver::Safari::Service.driver_path
         end
       end

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

@@ -32,22 +32,6 @@ module Selenium
         include DriverExtensions::HasWebStorage
         include DriverExtensions::TakesScreenshot
 
-        def initialize(opts = {})
-          opts[:desired_capabilities] ||= Remote::Capabilities.safari
-
-          opts[:url] ||= service_url(opts)
-
-          listener = opts.delete(:listener)
-          desired_capabilities = opts.delete(:desired_capabilities)
-          options = opts.delete(:options)
-
-          @bridge = Remote::Bridge.new(opts)
-          @bridge.extend Bridge
-          @bridge.create_session(desired_capabilities, options)
-
-          super(@bridge, listener: listener)
-        end
-
         def browser
           :safari
         end

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

@@ -20,10 +20,6 @@
 module Selenium
   module WebDriver
     module Safari
-      #
-      # @api private
-      #
-
       class Service < WebDriver::Service
         DEFAULT_PORT = 7050
         EXECUTABLE = 'safaridriver'

data/lib/selenium/webdriver/support.rb

@@ -23,3 +23,4 @@ require 'selenium/webdriver/support/block_event_listener'
 require 'selenium/webdriver/support/escaper'
 require 'selenium/webdriver/support/select'
 require 'selenium/webdriver/support/color'
+require 'selenium/webdriver/support/relative_locator'

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

@@ -109,7 +109,7 @@ module Selenium
         end
 
         def driver
-          @driver ||= Driver.new(self)
+          @driver ||= Driver.new(bridge: self)
         end
 
         def dispatch(name, *args)

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

@@ -0,0 +1,51 @@
+# 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 Support
+
+      #
+      # @api private
+      #
+
+      class RelativeLocator
+        KEYS = %w[above below left right near distance].freeze
+
+        def initialize(locator)
+          @filters, @root = locator.partition { |how, _| KEYS.include?(how) }.map(&:to_h)
+        end
+
+        def as_json
+          {
+            relative: {
+              root: @root,
+              filters: @filters.map do |kind, filter|
+                {
+                  kind: kind,
+                  args: [filter]
+                }
+              end
+            }
+          }
+        end
+      end
+    end
+  end
+end

data/lib/selenium/webdriver/version.rb

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

data/selenium-webdriver.gemspec

@@ -31,15 +31,16 @@ Gem::Specification.new do |s|
   s.files = Dir[root + '/**/*'].reject { |e| e =~ /ruby\.iml|build\.desc/ }.map { |e| e.sub(root + '/', '') }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'childprocess', ['>= 0.5', '< 2.0']
-  s.add_runtime_dependency 'rubyzip', ['~> 1.2', '>= 1.2.2']
+  s.add_runtime_dependency 'childprocess', ['>= 0.5', '< 4.0']
+  s.add_runtime_dependency 'rubyzip', ['>= 1.2.2']
+  s.add_runtime_dependency 'websocket', ['~> 1.0']
 
   # 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', ['~> 0.67.0']
+  s.add_development_dependency 'rubocop', ['~> 0.73.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.alpha3
+  version: 4.0.0.alpha4
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -20,7 +20,7 @@ dependencies:
         version: '0.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   name: childprocess
   prerelease: false
   type: :runtime
@@ -31,13 +31,10 @@ dependencies:
         version: '0.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
@@ -46,12 +43,23 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !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
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -113,7 +121,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.0
+        version: 0.73.0
   name: rubocop
   prerelease: false
   type: :development
@@ -121,7 +129,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.0
+        version: 0.73.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -197,6 +205,7 @@ files:
 - lib/selenium/server.rb
 - lib/selenium/webdriver.rb
 - lib/selenium/webdriver/atoms.rb
+- lib/selenium/webdriver/atoms/findElements.js
 - lib/selenium/webdriver/atoms/getAttribute.js
 - lib/selenium/webdriver/atoms/isDisplayed.js
 - lib/selenium/webdriver/chrome.rb
@@ -212,6 +221,7 @@ files:
 - lib/selenium/webdriver/common/driver_extensions/downloads_files.rb
 - lib/selenium/webdriver/common/driver_extensions/has_addons.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
 - lib/selenium/webdriver/common/driver_extensions/has_network_conditions.rb
 - lib/selenium/webdriver/common/driver_extensions/has_network_connection.rb
@@ -266,11 +276,9 @@ files:
 - lib/selenium/webdriver/edge_html/options.rb
 - lib/selenium/webdriver/edge_html/service.rb
 - lib/selenium/webdriver/firefox.rb
-- lib/selenium/webdriver/firefox/binary.rb
 - lib/selenium/webdriver/firefox/bridge.rb
 - lib/selenium/webdriver/firefox/driver.rb
 - lib/selenium/webdriver/firefox/extension.rb
-- lib/selenium/webdriver/firefox/extension/prefs.json
 - lib/selenium/webdriver/firefox/options.rb
 - lib/selenium/webdriver/firefox/profile.rb
 - lib/selenium/webdriver/firefox/profiles_ini.rb
@@ -301,6 +309,7 @@ files:
 - lib/selenium/webdriver/support/color.rb
 - lib/selenium/webdriver/support/escaper.rb
 - lib/selenium/webdriver/support/event_firing_bridge.rb
+- lib/selenium/webdriver/support/relative_locator.rb
 - lib/selenium/webdriver/support/select.rb
 - lib/selenium/webdriver/version.rb
 - selenium-webdriver.gemspec
@@ -326,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 2.7.9
 signing_key:
 specification_version: 4
 summary: The next generation developer focused tool for automated testing of webapps

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

@@ -1,110 +0,0 @@
-# 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 Firefox
-      # @api private
-      class Binary
-        class << self
-          #
-          # @api private
-          #
-          # @see Firefox.path=
-          #
-
-          def path=(path)
-            Platform.assert_executable(path)
-            @path = path
-          end
-
-          def reset_path!
-            @path = nil
-          end
-
-          def path
-            @path ||= case Platform.os
-                      when :macosx
-                        macosx_path
-                      when :windows
-                        windows_path
-                      when :linux, :unix
-                        Platform.find_binary('firefox3', 'firefox2', 'firefox') || '/usr/bin/firefox'
-                      else
-                        raise Error::WebDriverError, "unknown platform: #{Platform.os}"
-                      end
-
-            @path = Platform.cygwin_path(@path, windows: true) if Platform.cygwin?
-
-            unless File.file?(@path.to_s)
-              error = "Could not find Firefox binary (os=#{Platform.os}). " \
-                      "Make sure Firefox is installed or set the path manually with #{self}.path="
-              raise Error::WebDriverError, error
-            end
-
-            @path
-          end
-
-          def version
-            @version = case Platform.os
-                       when :macosx
-                         `#{path} -v`.strip[/[^\s]*$/][/^\d+/].to_i
-                       when :windows
-                         `\"#{path}\" -v | more`.strip[/[^\s]*$/][/^\d+/].to_i
-                       when :linux
-                         `#{path} -v`.strip[/[^\s]*$/][/^\d+/].to_i
-                       else
-                         0
-                       end
-          end
-
-          private
-
-          def windows_path
-            windows_registry_path ||
-              Platform.find_in_program_files('\\Mozilla Firefox\\firefox.exe') ||
-              Platform.find_binary('firefox')
-          end
-
-          def macosx_path
-            path = '/Applications/Firefox.app/Contents/MacOS/firefox-bin'
-            path = File.expand_path('~/Applications/Firefox.app/Contents/MacOS/firefox-bin') unless File.exist?(path)
-            path = Platform.find_binary('firefox-bin') unless File.exist?(path)
-
-            path
-          end
-
-          def windows_registry_path
-            require 'win32/registry'
-
-            lm = Win32::Registry::HKEY_LOCAL_MACHINE
-            lm.open('SOFTWARE\\Mozilla\\Mozilla Firefox') do |reg|
-              main = lm.open("SOFTWARE\\Mozilla\\Mozilla Firefox\\#{reg.keys[0]}\\Main")
-              entry = main.find { |key, _type, _data| /pathtoexe/i.match? key }
-              return entry.last if entry
-            end
-          rescue LoadError
-            # older JRuby or IronRuby does not have win32/registry
-          rescue Win32::Registry::Error
-          end
-        end # class << self
-      end # Binary
-    end # Firefox
-  end # WebDriver
-end # Selenium

data/lib/selenium/webdriver/firefox/extension/prefs.json

@@ -1,69 +0,0 @@
-{
-  "frozen": {
-    "app.update.auto": false,
-    "app.update.enabled": false,
-    "browser.displayedE10SNotice": 4,
-    "browser.download.manager.showWhenStarting": false,
-    "browser.EULA.override": true,
-    "browser.EULA.3.accepted": true,
-    "browser.link.open_external": 2,
-    "browser.link.open_newwindow": 2,
-    "browser.offline": false,
-    "browser.reader.detectedFirstArticle": true,
-    "browser.safebrowsing.enabled": false,
-    "browser.safebrowsing.malware.enabled": false,
-    "browser.search.update": false,
-    "browser.selfsupport.url" : "",
-    "browser.sessionstore.resume_from_crash": false,
-    "browser.shell.checkDefaultBrowser": false,
-    "browser.tabs.warnOnClose": false,
-    "browser.tabs.warnOnOpen": false,
-    "datareporting.healthreport.service.enabled": false,
-    "datareporting.healthreport.uploadEnabled": false,
-    "datareporting.healthreport.service.firstRun": false,
-    "datareporting.healthreport.logging.consoleEnabled": false,
-    "datareporting.policy.dataSubmissionEnabled": false,
-    "datareporting.policy.dataSubmissionPolicyAccepted": false,
-    "devtools.errorconsole.enabled": true,
-    "dom.disable_open_during_load": false,
-    "extensions.autoDisableScopes": 10,
-    "extensions.blocklist.enabled": false,
-    "extensions.checkCompatibility.nightly": false,
-    "extensions.update.enabled": false,
-    "extensions.update.notifyUser": false,
-    "javascript.enabled": true,
-    "network.manage-offline-status": false,
-    "network.http.phishy-userpass-length": 255,
-    "offline-apps.allow_by_default": true,
-    "prompts.tab_modal.enabled": false,
-    "security.fileuri.origin_policy": 3,
-    "security.fileuri.strict_origin_policy": false,
-    "signon.rememberSignons": false,
-    "toolkit.networkmanager.disable": true,
-    "toolkit.telemetry.prompted": 2,
-    "toolkit.telemetry.enabled": false,
-    "toolkit.telemetry.rejected": true,
-    "xpinstall.signatures.required": false,
-    "xpinstall.whitelist.required": false
-  },
-  "mutable": {
-    "browser.dom.window.dump.enabled": true,
-    "browser.laterrun.enabled": false,
-    "browser.newtab.url": "about:blank",
-    "browser.newtabpage.enabled": false,
-    "browser.startup.page": 0,
-    "browser.startup.homepage": "about:blank",
-    "browser.startup.homepage_override.mstone": "ignore",
-    "browser.usedOnWindows10.introURL": "about:blank",
-    "dom.max_chrome_script_run_time": 30,
-    "dom.max_script_run_time": 30,
-    "dom.report_all_js_exceptions": true,
-    "javascript.options.showInConsole": true,
-    "network.captive-portal-service.enabled": false,
-    "security.csp.enable": false,
-    "startup.homepage_welcome_url": "about:blank",
-    "startup.homepage_welcome_url.additional": "about:blank",
-    "webdriver_accept_untrusted_certs": true,
-    "webdriver_assume_untrusted_issuer": true
-  }
-}