selenium-webdriver 4.0.0.alpha7 → 4.0.0.beta1

data/lib/selenium/webdriver/devtools/{v84 → v88}/system_info.rb

@@ -22,10 +22,10 @@ module Selenium
   module WebDriver
     class DevTools
       def system_info
-        @system_info ||= V84::SystemInfo.new(self)
+        @system_info ||= V88::SystemInfo.new(self)
       end
 
-      module V84
+      module V88
         class SystemInfo
 
           def initialize(devtools)
@@ -45,7 +45,7 @@ module Selenium
             @devtools.send_cmd('SystemInfo.getProcessInfo')
           end
 
-        end # V84
+        end # V88
       end # SystemInfo
     end # DevTools
   end # WebDriver

data/lib/selenium/webdriver/devtools/{v84 → v88}/target.rb

@@ -22,10 +22,10 @@ module Selenium
   module WebDriver
     class DevTools
       def target
-        @target ||= V84::Target.new(self)
+        @target ||= V88::Target.new(self)
       end
 
-      module V84
+      module V88
         class Target
           EVENTS = {
             attached_to_target: 'attachedToTarget',
@@ -72,9 +72,11 @@ module Selenium
                                bindingName: binding_name)
           end
 
-          def create_browser_context(dispose_on_detach: nil)
+          def create_browser_context(dispose_on_detach: nil, proxy_server: nil, proxy_bypass_list: nil)
             @devtools.send_cmd('Target.createBrowserContext',
-                               disposeOnDetach: dispose_on_detach)
+                               disposeOnDetach: dispose_on_detach,
+                               proxyServer: proxy_server,
+                               proxyBypassList: proxy_bypass_list)
           end
 
           def get_browser_contexts
@@ -136,7 +138,7 @@ module Selenium
                                locations: locations)
           end
 
-        end # V84
+        end # V88
       end # Target
     end # DevTools
   end # WebDriver

data/lib/selenium/webdriver/devtools/{v84 → v88}/tethering.rb

@@ -22,10 +22,10 @@ module Selenium
   module WebDriver
     class DevTools
       def tethering
-        @tethering ||= V84::Tethering.new(self)
+        @tethering ||= V88::Tethering.new(self)
       end
 
-      module V84
+      module V88
         class Tethering
           EVENTS = {
             accepted: 'accepted',
@@ -50,7 +50,7 @@ module Selenium
                                port: port)
           end
 
-        end # V84
+        end # V88
       end # Tethering
     end # DevTools
   end # WebDriver

data/lib/selenium/webdriver/devtools/{v84 → v88}/tracing.rb

@@ -22,10 +22,10 @@ module Selenium
   module WebDriver
     class DevTools
       def tracing
-        @tracing ||= V84::Tracing.new(self)
+        @tracing ||= V88::Tracing.new(self)
       end
 
-      module V84
+      module V88
         class Tracing
           EVENTS = {
             buffer_usage: 'bufferUsage',
@@ -55,9 +55,10 @@ module Selenium
                                syncId: sync_id)
           end
 
-          def request_memory_dump(deterministic: nil)
+          def request_memory_dump(deterministic: nil, level_of_detail: nil)
             @devtools.send_cmd('Tracing.requestMemoryDump',
-                               deterministic: deterministic)
+                               deterministic: deterministic,
+                               levelOfDetail: level_of_detail)
           end
 
           def start(categories: nil, options: nil, buffer_usage_reporting_interval: nil, transfer_mode: nil, stream_format: nil, stream_compression: nil, trace_config: nil)
@@ -71,7 +72,7 @@ module Selenium
                                traceConfig: trace_config)
           end
 
-        end # V84
+        end # V88
       end # Tracing
     end # DevTools
   end # WebDriver

data/lib/selenium/webdriver/devtools/{v84 → v88}/web_audio.rb

@@ -22,10 +22,10 @@ module Selenium
   module WebDriver
     class DevTools
       def web_audio
-        @web_audio ||= V84::WebAudio.new(self)
+        @web_audio ||= V88::WebAudio.new(self)
       end
 
-      module V84
+      module V88
         class WebAudio
           EVENTS = {
             context_created: 'contextCreated',
@@ -65,7 +65,7 @@ module Selenium
                                contextId: context_id)
           end
 
-        end # V84
+        end # V88
       end # WebAudio
     end # DevTools
   end # WebDriver

data/lib/selenium/webdriver/devtools/{v84 → v88}/web_authn.rb

@@ -22,10 +22,10 @@ module Selenium
   module WebDriver
     class DevTools
       def web_authn
-        @web_authn ||= V84::WebAuthn.new(self)
+        @web_authn ||= V88::WebAuthn.new(self)
       end
 
-      module V84
+      module V88
         class WebAuthn
 
           def initialize(devtools)
@@ -89,7 +89,13 @@ module Selenium
                                isUserVerified: is_user_verified)
           end
 
-        end # V84
+          def set_automatic_presence_simulation(authenticator_id:, enabled:)
+            @devtools.send_cmd('WebAuthn.setAutomaticPresenceSimulation',
+                               authenticatorId: authenticator_id,
+                               enabled: enabled)
+          end
+
+        end # V88
       end # WebAuthn
     end # DevTools
   end # WebDriver

data/lib/selenium/webdriver/edge.rb

@@ -21,32 +21,12 @@ require 'net/http'
 
 module Selenium
   module WebDriver
-    module EdgeHtml
-      autoload :Driver, 'selenium/webdriver/edge_html/driver'
-      autoload :Options, 'selenium/webdriver/edge_html/options'
-      autoload :Service, 'selenium/webdriver/edge_html/service'
-
-      def self.driver_path=(path)
-        WebDriver.logger.deprecate 'Selenium::WebDriver::Edge#driver_path=',
-                                   'Selenium::WebDriver::Edge::Service#driver_path=',
-                                   id: :driver_path
-        Selenium::WebDriver::Edge::Service.driver_path = path
-      end
-
-      def self.driver_path
-        WebDriver.logger.deprecate 'Selenium::WebDriver::Edge#driver_path',
-                                   'Selenium::WebDriver::Edge::Service#driver_path',
-                                   id: :driver_path
-        Selenium::WebDriver::Edge::Service.driver_path
-      end
-    end # EdgeHtml
-
-    module EdgeChrome
-      autoload :Bridge, 'selenium/webdriver/edge_chrome/bridge'
-      autoload :Driver, 'selenium/webdriver/edge_chrome/driver'
-      autoload :Profile, 'selenium/webdriver/edge_chrome/profile'
-      autoload :Options, 'selenium/webdriver/edge_chrome/options'
-      autoload :Service, 'selenium/webdriver/edge_chrome/service'
+    module Edge
+      autoload :Bridge, 'selenium/webdriver/edge/bridge'
+      autoload :Driver, 'selenium/webdriver/edge/driver'
+      autoload :Profile, 'selenium/webdriver/edge/profile'
+      autoload :Options, 'selenium/webdriver/edge/options'
+      autoload :Service, 'selenium/webdriver/edge/service'
 
       def self.path=(path)
         Platform.assert_executable path
@@ -56,8 +36,6 @@ module Selenium
       def self.path
         @path ||= nil
       end
-    end # EdgeHtml
-
-    Edge = EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/{edge_chrome → edge}/bridge.rb

@@ -21,7 +21,7 @@ require 'selenium/webdriver/chrome/bridge'
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       class Bridge < WebDriver::Chrome::Bridge
 
         COMMANDS = WebDriver::Chrome::Bridge::COMMANDS.merge(
@@ -32,6 +32,6 @@ module Selenium
           COMMANDS[command] || super
         end
       end # Bridge
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/{edge_chrome → edge}/driver.rb

@@ -21,16 +21,16 @@ require 'selenium/webdriver/chrome/driver'
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
 
       #
-      # Driver implementation for EdgeChrome.
+      # Driver implementation for Microsoft Edge.
       # @api private
       #
 
       class Driver < Selenium::WebDriver::Chrome::Driver
         def browser
-          :edge_chrome
+          :edge
         end
 
         def bridge_class
@@ -43,6 +43,6 @@ module Selenium
           capabilities['ms:edgeOptions']['debuggerAddress']
         end
       end # Driver
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

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

@@ -0,0 +1,39 @@
+# 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 'selenium/webdriver/chrome/features'
+
+module Selenium
+  module WebDriver
+    module Edge
+      module Features
+
+        include WebDriver::Chrome::Features
+
+        EDGE_COMMANDS = {
+          send_command: [:post, 'session/:session_id/ms/cdp/execute']
+        }.freeze
+
+        def commands(command)
+          EDGE_COMMANDS[command] || Chrome::Features::CHROME_COMMANDS[command] || self.class::COMMANDS[command]
+        end
+      end # Bridge
+    end # Edge
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/{edge_chrome → edge}/options.rb

@@ -21,17 +21,23 @@ require 'selenium/webdriver/chrome/options'
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       class Options < Selenium::WebDriver::Chrome::Options
         KEY = 'ms:edgeOptions'
         BROWSER = 'MicrosoftEdge'
 
+        protected
+
+        def enable_logging(browser_options)
+          browser_options['ms:loggingPrefs'] = @logging_prefs
+        end
+
         private
 
         def binary_path
-          EdgeChrome.path
+          Edge.path
         end
       end # Options
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/{edge_chrome → edge}/profile.rb

@@ -21,13 +21,13 @@ require 'selenium/webdriver/chrome/profile'
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       #
       # @private
       #
 
       class Profile < Selenium::WebDriver::Chrome::Profile
       end # Profile
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/{edge_chrome → edge}/service.rb

@@ -21,7 +21,7 @@ require 'selenium/webdriver/chrome/service'
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       class Service < Selenium::WebDriver::Chrome::Service
         DEFAULT_PORT = 9515
         EXECUTABLE = 'msedgedriver'
@@ -31,6 +31,6 @@ module Selenium
         ERROR
         SHUTDOWN_SUPPORTED = true
       end # Service
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

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

@@ -28,7 +28,10 @@ module Selenium
 
       class Driver < WebDriver::Driver
         include DriverExtensions::HasAddons
+        include DriverExtensions::HasDevTools
+        include DriverExtensions::HasLogEvents
         include DriverExtensions::HasWebStorage
+        include DriverExtensions::PrintsPage
 
         def browser
           :firefox
@@ -37,6 +40,16 @@ module Selenium
         def bridge_class
           Bridge
         end
+
+        private
+
+        def devtools_version
+          85
+        end
+
+        def debugger_address
+          capabilities['moz:debuggerAddress']
+        end
       end # Driver
     end # Firefox
   end # WebDriver

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

@@ -0,0 +1,47 @@
+# 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
+      module Features
+
+        FIREFOX_COMMANDS = {
+          install_addon: [:post, 'session/:session_id/moz/addon/install'],
+          uninstall_addon: [:post, 'session/:session_id/moz/addon/uninstall']
+        }.freeze
+
+        def commands(command)
+          FIREFOX_COMMANDS[command] || self.class::COMMANDS[command]
+        end
+
+        def install_addon(path, temporary)
+          payload = {path: path}
+          payload[:temporary] = temporary unless temporary.nil?
+          execute :install_addon, {}, payload
+        end
+
+        def uninstall_addon(id)
+          execute :uninstall_addon, {}, {id: id}
+        end
+
+      end # Bridge
+    end # Firefox
+  end # WebDriver
+end # Selenium

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

@@ -21,25 +21,19 @@ module Selenium
   module WebDriver
     module Firefox
       class Options < WebDriver::Options
+        attr_accessor :debugger_address
+
         KEY = 'moz:firefoxOptions'
 
         # see: https://firefox-source-docs.mozilla.org/testing/geckodriver/Capabilities.html
         CAPABILITIES = {binary: 'binary',
                         args: 'args',
-                        profile: 'profile',
                         log: 'log',
                         prefs: 'prefs'}.freeze
         BROWSER = 'firefox'
 
-        CAPABILITIES.each_key do |key|
-          define_method key do
-            @options[key]
-          end
-
-          define_method "#{key}=" do |value|
-            @options[key] = value
-          end
-        end
+        # NOTE: special handling of 'profile' to validate when set instead of when used
+        attr_reader :profile
 
         #
         # Create a new Options instance, only for W3C-capable versions of Firefox.
@@ -58,10 +52,15 @@ module Selenium
         #
 
         def initialize(log_level: nil, **opts)
+          @debugger_address = opts.delete(:debugger_address)
+
           super(**opts)
 
+          @options[:args] ||= []
+          @options[:prefs] ||= {}
           @options[:log] ||= {level: log_level} if log_level
-          process_profile(@options[:profile]) if @options.key?(:profile)
+
+          process_profile(@options.delete(:profile))
         end
 
         #
@@ -75,7 +74,6 @@ module Selenium
         #
 
         def add_argument(arg)
-          @options[:args] ||= []
           @options[:args] << arg
         end
 
@@ -91,7 +89,6 @@ module Selenium
         #
 
         def add_preference(name, value)
-          @options[:prefs] ||= {}
           @options[:prefs][name] = value
         end
 
@@ -122,7 +119,6 @@ module Selenium
         # @param [Profile, String] profile Profile to be used
         #
 
-        undef profile=
         def profile=(profile)
           process_profile(profile)
         end
@@ -138,18 +134,21 @@ module Selenium
         private
 
         def process_browser_options(browser_options)
+          browser_options['moz:debuggerAddress'] = true if @debugger_address
           options = browser_options[KEY]
           options['binary'] ||= Firefox.path if Firefox.path
+          options['profile'] = @profile if @profile
         end
 
         def process_profile(profile)
-          @options[:profile] = if profile.nil?
-                                 nil
-                               elsif profile.is_a? Profile
-                                 profile
-                               else
-                                 Profile.from_name(profile)
-                               end
+          @profile = case profile
+                     when nil
+                       nil
+                     when Profile
+                       profile
+                     else
+                       Profile.from_name(profile)
+                     end
         end
       end # Options
     end # Firefox