selenium-webdriver 4.0.0.alpha6 → 4.0.0.beta4

data/lib/selenium/webdriver/devtools/{console.rb → request.rb}

@@ -17,41 +17,41 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# This file is automatically generated. Any changes will be lost!
 module Selenium
   module WebDriver
     class DevTools
-      def console
-        @console ||= Console.new(self)
-      end
+      class Request
 
-      class Console
-        EVENTS = {
-          message_added: 'messageAdded',
-        }
+        attr_reader :url, :method, :headers
 
-        def initialize(devtools)
+        def initialize(devtools:, id:, url:, method:, headers:)
           @devtools = devtools
+          @id = id
+          @url = url
+          @method = method
+          @headers = headers
         end
 
-        def on(event, &block)
-          event = EVENTS[event] if event.is_a?(Symbol)
-          @devtools.callbacks["Console.#{event}"] << block
+        def continue
+          @devtools.fetch.continue_request(request_id: @id)
         end
 
-        def clear_messages
-          @devtools.send_cmd('Console.clearMessages')
+        def respond(code: 200, headers: {}, body: '')
+          @devtools.fetch.fulfill_request(
+            request_id: @id,
+            body: Base64.strict_encode64(body),
+            response_code: code,
+            response_headers: headers.map do |k, v|
+              {name: k, value: v}
+            end
+          )
         end
 
-        def disable
-          @devtools.send_cmd('Console.disable')
+        def inspect
+          %(#<#{self.class.name} @method="#{method}" @url="#{url}")
         end
 
-        def enable
-          @devtools.send_cmd('Console.enable')
-        end
-
-      end # Console
+      end # Request
     end # DevTools
   end # WebDriver
-end # Selenium
+end # Selenium

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 :Features, 'selenium/webdriver/edge/features'
+      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 # EdgeChrome
-
-    Edge = EdgeHtml # Alias EdgeHtml as Edge for now
+    end # Edge
   end # WebDriver
 end # Selenium

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

@@ -21,22 +21,24 @@ 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
-          Bridge
+        private
+
+        def devtools_address
+          "http://#{capabilities['ms:edgeOptions']['debuggerAddress']}"
         end
       end # Driver
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

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

@@ -17,21 +17,23 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'selenium/webdriver/chrome/bridge'
+require 'selenium/webdriver/chrome/features'
 
 module Selenium
   module WebDriver
-    module EdgeChrome
-      class Bridge < WebDriver::Chrome::Bridge
+    module Edge
+      module Features
 
-        COMMANDS = WebDriver::Chrome::Bridge::COMMANDS.merge(
+        include WebDriver::Chrome::Features
+
+        EDGE_COMMANDS = {
           send_command: [:post, 'session/:session_id/ms/cdp/execute']
-        ).freeze
+        }.freeze
 
         def commands(command)
-          COMMANDS[command] || super
+          EDGE_COMMANDS[command] || Chrome::Features::CHROME_COMMANDS[command] || self.class::COMMANDS[command]
         end
       end # Bridge
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

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

@@ -21,16 +21,23 @@ require 'selenium/webdriver/chrome/options'
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       class Options < Selenium::WebDriver::Chrome::Options
-        BROWSER = 'MSEdge'
+        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.rb

@@ -27,7 +27,7 @@ module Selenium
       autoload :Extension, 'selenium/webdriver/firefox/extension'
       autoload :ProfilesIni, 'selenium/webdriver/firefox/profiles_ini'
       autoload :Profile, 'selenium/webdriver/firefox/profile'
-      autoload :Bridge, 'selenium/webdriver/firefox/bridge'
+      autoload :Features, 'selenium/webdriver/firefox/features'
       autoload :Driver, 'selenium/webdriver/firefox/driver'
       autoload :Options, 'selenium/webdriver/firefox/options'
       autoload :Service, 'selenium/webdriver/firefox/service'
@@ -38,6 +38,10 @@ module Selenium
       DEFAULT_ASSUME_UNTRUSTED_ISSUER = true
       DEFAULT_LOAD_NO_FOCUS_LIB = false
 
+      # Mozilla Automation Team asked to only support 85
+      # until WebDriver Bidi is available.
+      DEVTOOLS_VERSION = 85
+
       def self.driver_path=(path)
         WebDriver.logger.deprecate 'Selenium::WebDriver::Firefox#driver_path=',
                                    'Selenium::WebDriver::Firefox::Service#driver_path=',

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

@@ -27,16 +27,29 @@ module Selenium
       #
 
       class Driver < WebDriver::Driver
-        include DriverExtensions::HasAddons
-        include DriverExtensions::HasWebStorage
-        include DriverExtensions::TakesScreenshot
+        EXTENSIONS = [DriverExtensions::HasAddons,
+                      DriverExtensions::FullPageScreenshot,
+                      DriverExtensions::HasDevTools,
+                      DriverExtensions::HasLogEvents,
+                      DriverExtensions::HasNetworkInterception,
+                      DriverExtensions::HasWebStorage,
+                      DriverExtensions::PrintsPage].freeze
 
         def browser
           :firefox
         end
 
-        def bridge_class
-          Bridge
+        private
+
+        def devtools_url
+          uri = URI("http://#{capabilities['moz:debuggerAddress']}")
+          response = Net::HTTP.get(uri.hostname, '/json/version', uri.port)
+
+          JSON.parse(response)['webSocketDebuggerUrl']
+        end
+
+        def devtools_version
+          Firefox::DEVTOOLS_VERSION
         end
       end # Driver
     end # Firefox

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

@@ -20,15 +20,16 @@
 module Selenium
   module WebDriver
     module Firefox
-      class Bridge < WebDriver::Remote::Bridge
+      module Features
 
-        COMMANDS = {
+        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)
-          COMMANDS[command] || super
+          FIREFOX_COMMANDS[command] || self.class::COMMANDS[command]
         end
 
         def install_addon(path, temporary)
@@ -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/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

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

@@ -25,6 +25,14 @@ module Selenium
 
         VALID_PREFERENCE_TYPES = [TrueClass, FalseClass, Integer, Float, String].freeze
 
+        DEFAULT_PREFERENCES = {
+          "browser.newtabpage.enabled" => false,
+          "browser.startup.homepage" => "about:blank",
+          "browser.usedOnWindows10.introURL" => "about:blank",
+          "network.captive-portal-service.enabled" => false,
+          "security.csp.enable" => false
+        }.freeze
+
         attr_reader   :name, :log_file
         attr_writer   :secure_ssl, :load_no_focus_lib
 
@@ -179,10 +187,12 @@ module Selenium
 
         def update_user_prefs_in(directory)
           path = File.join(directory, 'user.js')
-          prefs = read_user_prefs(path).merge(@additional_prefs)
+          prefs = read_user_prefs(path)
+          prefs.merge! self.class::DEFAULT_PREFERENCES
+          prefs.merge!(@additional_prefs)
 
           # If the user sets the home page, we should also start up there
-          prefs['startup.homepage_welcome_url'] = prefs['browser.startup.homepage']
+          prefs['startup.homepage_welcome_url'] ||= prefs['browser.startup.homepage']
 
           write_prefs prefs, path
         end