selenium-webdriver 3.141.0 → 3.142.7

data/lib/selenium/webdriver/remote/oss/commands.rb

@@ -1,3 +1,5 @@
+# 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
@@ -28,190 +30,190 @@ module Selenium
         class Bridge
 
           COMMANDS = {
-            get_capabilities: [:get, 'session/:session_id'.freeze],
-            status: [:get, 'status'.freeze],
+            get_capabilities: [:get, 'session/:session_id'],
+            status: [:get, 'status'],
 
             #
             # basic driver
             #
 
-            get_current_url: [:get, 'session/:session_id/url'.freeze],
-            get: [:post, 'session/:session_id/url'.freeze],
-            go_forward: [:post, 'session/:session_id/forward'.freeze],
-            go_back: [:post, 'session/:session_id/back'.freeze],
-            refresh: [:post, 'session/:session_id/refresh'.freeze],
-            quit: [:delete, 'session/:session_id'.freeze],
-            close: [:delete, 'session/:session_id/window'.freeze],
-            get_page_source: [:get, 'session/:session_id/source'.freeze],
-            get_title: [:get, 'session/:session_id/title'.freeze],
-            find_element: [:post, 'session/:session_id/element'.freeze],
-            find_elements: [:post, 'session/:session_id/elements'.freeze],
-            get_active_element: [:post, 'session/:session_id/element/active'.freeze],
+            get_current_url: [:get, 'session/:session_id/url'],
+            get: [:post, 'session/:session_id/url'],
+            go_forward: [:post, 'session/:session_id/forward'],
+            go_back: [:post, 'session/:session_id/back'],
+            refresh: [:post, 'session/:session_id/refresh'],
+            quit: [:delete, 'session/:session_id'],
+            close: [:delete, 'session/:session_id/window'],
+            get_page_source: [:get, 'session/:session_id/source'],
+            get_title: [:get, 'session/:session_id/title'],
+            find_element: [:post, 'session/:session_id/element'],
+            find_elements: [:post, 'session/:session_id/elements'],
+            get_active_element: [:post, 'session/:session_id/element/active'],
 
             #
             # window handling
             #
 
-            get_current_window_handle: [:get, 'session/:session_id/window_handle'.freeze],
-            get_window_handles: [:get, 'session/:session_id/window_handles'.freeze],
-            set_window_size: [:post, 'session/:session_id/window/:window_handle/size'.freeze],
-            set_window_position: [:post, 'session/:session_id/window/:window_handle/position'.freeze],
-            get_window_size: [:get, 'session/:session_id/window/:window_handle/size'.freeze],
-            get_window_position: [:get, 'session/:session_id/window/:window_handle/position'.freeze],
-            maximize_window: [:post, 'session/:session_id/window/:window_handle/maximize'.freeze],
+            get_current_window_handle: [:get, 'session/:session_id/window_handle'],
+            get_window_handles: [:get, 'session/:session_id/window_handles'],
+            set_window_size: [:post, 'session/:session_id/window/:window_handle/size'],
+            set_window_position: [:post, 'session/:session_id/window/:window_handle/position'],
+            get_window_size: [:get, 'session/:session_id/window/:window_handle/size'],
+            get_window_position: [:get, 'session/:session_id/window/:window_handle/position'],
+            maximize_window: [:post, 'session/:session_id/window/:window_handle/maximize'],
 
             #
             # script execution
             #
 
-            execute_script: [:post, 'session/:session_id/execute'.freeze],
-            execute_async_script: [:post, 'session/:session_id/execute_async'.freeze],
+            execute_script: [:post, 'session/:session_id/execute'],
+            execute_async_script: [:post, 'session/:session_id/execute_async'],
 
             #
             # screenshot
             #
 
-            screenshot: [:get, 'session/:session_id/screenshot'.freeze],
+            screenshot: [:get, 'session/:session_id/screenshot'],
 
             #
             # alerts
             #
 
-            dismiss_alert: [:post, 'session/:session_id/dismiss_alert'.freeze],
-            accept_alert: [:post, 'session/:session_id/accept_alert'.freeze],
-            get_alert_text: [:get, 'session/:session_id/alert_text'.freeze],
-            set_alert_value: [:post, 'session/:session_id/alert_text'.freeze],
-            set_authentication: [:post, 'session/:session_id/alert/credentials'.freeze],
+            dismiss_alert: [:post, 'session/:session_id/dismiss_alert'],
+            accept_alert: [:post, 'session/:session_id/accept_alert'],
+            get_alert_text: [:get, 'session/:session_id/alert_text'],
+            set_alert_value: [:post, 'session/:session_id/alert_text'],
+            set_authentication: [:post, 'session/:session_id/alert/credentials'],
 
             #
             # target locator
             #
 
-            switch_to_frame: [:post, 'session/:session_id/frame'.freeze],
-            switch_to_parent_frame: [:post, 'session/:session_id/frame/parent'.freeze],
-            switch_to_window: [:post, 'session/:session_id/window'.freeze],
+            switch_to_frame: [:post, 'session/:session_id/frame'],
+            switch_to_parent_frame: [:post, 'session/:session_id/frame/parent'],
+            switch_to_window: [:post, 'session/:session_id/window'],
 
             #
             # options
             #
 
-            get_cookies: [:get, 'session/:session_id/cookie'.freeze],
-            add_cookie: [:post, 'session/:session_id/cookie'.freeze],
-            delete_all_cookies: [:delete, 'session/:session_id/cookie'.freeze],
-            delete_cookie: [:delete, 'session/:session_id/cookie/:name'.freeze],
+            get_cookies: [:get, 'session/:session_id/cookie'],
+            add_cookie: [:post, 'session/:session_id/cookie'],
+            delete_all_cookies: [:delete, 'session/:session_id/cookie'],
+            delete_cookie: [:delete, 'session/:session_id/cookie/:name'],
 
             #
             # timeouts
             #
 
-            implicitly_wait: [:post, 'session/:session_id/timeouts/implicit_wait'.freeze],
-            set_script_timeout: [:post, 'session/:session_id/timeouts/async_script'.freeze],
-            set_timeout: [:post, 'session/:session_id/timeouts'.freeze],
+            implicitly_wait: [:post, 'session/:session_id/timeouts/implicit_wait'],
+            set_script_timeout: [:post, 'session/:session_id/timeouts/async_script'],
+            set_timeout: [:post, 'session/:session_id/timeouts'],
 
             #
             # element
             #
 
-            describe_element: [:get, 'session/:session_id/element/:id'.freeze],
-            find_child_element: [:post, 'session/:session_id/element/:id/element'.freeze],
-            find_child_elements: [:post, 'session/:session_id/element/:id/elements'.freeze],
-            click_element: [:post, 'session/:session_id/element/:id/click'.freeze],
-            submit_element: [:post, 'session/:session_id/element/:id/submit'.freeze],
-            get_element_value: [:get, 'session/:session_id/element/:id/value'.freeze],
-            send_keys_to_element: [:post, 'session/:session_id/element/:id/value'.freeze],
-            upload_file: [:post, 'session/:session_id/file'.freeze],
-            get_element_tag_name: [:get, 'session/:session_id/element/:id/name'.freeze],
-            clear_element: [:post, 'session/:session_id/element/:id/clear'.freeze],
-            is_element_selected: [:get, 'session/:session_id/element/:id/selected'.freeze],
-            is_element_enabled: [:get, 'session/:session_id/element/:id/enabled'.freeze],
-            get_element_attribute: [:get, 'session/:session_id/element/:id/attribute/:name'.freeze],
-            element_equals: [:get, 'session/:session_id/element/:id/equals/:other'.freeze],
-            is_element_displayed: [:get, 'session/:session_id/element/:id/displayed'.freeze],
-            get_element_location: [:get, 'session/:session_id/element/:id/location'.freeze],
-            get_element_location_once_scrolled_into_view: [:get, 'session/:session_id/element/:id/location_in_view'.freeze],
-            get_element_size: [:get, 'session/:session_id/element/:id/size'.freeze],
-            drag_element: [:post, 'session/:session_id/element/:id/drag'.freeze],
-            get_element_value_of_css_property: [:get, 'session/:session_id/element/:id/css/:property_name'.freeze],
-            get_element_text: [:get, 'session/:session_id/element/:id/text'.freeze],
+            describe_element: [:get, 'session/:session_id/element/:id'],
+            find_child_element: [:post, 'session/:session_id/element/:id/element'],
+            find_child_elements: [:post, 'session/:session_id/element/:id/elements'],
+            click_element: [:post, 'session/:session_id/element/:id/click'],
+            submit_element: [:post, 'session/:session_id/element/:id/submit'],
+            get_element_value: [:get, 'session/:session_id/element/:id/value'],
+            send_keys_to_element: [:post, 'session/:session_id/element/:id/value'],
+            upload_file: [:post, 'session/:session_id/file'],
+            get_element_tag_name: [:get, 'session/:session_id/element/:id/name'],
+            clear_element: [:post, 'session/:session_id/element/:id/clear'],
+            is_element_selected: [:get, 'session/:session_id/element/:id/selected'],
+            is_element_enabled: [:get, 'session/:session_id/element/:id/enabled'],
+            get_element_attribute: [:get, 'session/:session_id/element/:id/attribute/:name'],
+            element_equals: [:get, 'session/:session_id/element/:id/equals/:other'],
+            is_element_displayed: [:get, 'session/:session_id/element/:id/displayed'],
+            get_element_location: [:get, 'session/:session_id/element/:id/location'],
+            get_element_location_once_scrolled_into_view: [:get, 'session/:session_id/element/:id/location_in_view'],
+            get_element_size: [:get, 'session/:session_id/element/:id/size'],
+            drag_element: [:post, 'session/:session_id/element/:id/drag'],
+            get_element_value_of_css_property: [:get, 'session/:session_id/element/:id/css/:property_name'],
+            get_element_text: [:get, 'session/:session_id/element/:id/text'],
 
             #
             # rotatable
             #
 
-            get_screen_orientation: [:get, 'session/:session_id/orientation'.freeze],
-            set_screen_orientation: [:post, 'session/:session_id/orientation'.freeze],
+            get_screen_orientation: [:get, 'session/:session_id/orientation'],
+            set_screen_orientation: [:post, 'session/:session_id/orientation'],
 
             #
             # interactions API
             #
 
-            click: [:post, 'session/:session_id/click'.freeze],
-            double_click: [:post, 'session/:session_id/doubleclick'.freeze],
-            mouse_down: [:post, 'session/:session_id/buttondown'.freeze],
-            mouse_up: [:post, 'session/:session_id/buttonup'.freeze],
-            mouse_move_to: [:post, 'session/:session_id/moveto'.freeze],
-            send_modifier_key_to_active_element: [:post, 'session/:session_id/modifier'.freeze],
-            send_keys_to_active_element: [:post, 'session/:session_id/keys'.freeze],
+            click: [:post, 'session/:session_id/click'],
+            double_click: [:post, 'session/:session_id/doubleclick'],
+            mouse_down: [:post, 'session/:session_id/buttondown'],
+            mouse_up: [:post, 'session/:session_id/buttonup'],
+            mouse_move_to: [:post, 'session/:session_id/moveto'],
+            send_modifier_key_to_active_element: [:post, 'session/:session_id/modifier'],
+            send_keys_to_active_element: [:post, 'session/:session_id/keys'],
 
             #
             # html 5
             #
 
-            execute_sql: [:post, 'session/:session_id/execute_sql'.freeze],
+            execute_sql: [:post, 'session/:session_id/execute_sql'],
 
-            get_location: [:get, 'session/:session_id/location'.freeze],
-            set_location: [:post, 'session/:session_id/location'.freeze],
+            get_location: [:get, 'session/:session_id/location'],
+            set_location: [:post, 'session/:session_id/location'],
 
-            get_app_cache: [:get, 'session/:session_id/application_cache'.freeze],
-            get_app_cache_status: [:get, 'session/:session_id/application_cache/status'.freeze],
-            clear_app_cache: [:delete, 'session/:session_id/application_cache/clear'.freeze],
+            get_app_cache: [:get, 'session/:session_id/application_cache'],
+            get_app_cache_status: [:get, 'session/:session_id/application_cache/status'],
+            clear_app_cache: [:delete, 'session/:session_id/application_cache/clear'],
 
-            get_network_connection: [:get, 'session/:session_id/network_connection'.freeze],
-            set_network_connection: [:post, 'session/:session_id/network_connection'.freeze],
+            get_network_connection: [:get, 'session/:session_id/network_connection'],
+            set_network_connection: [:post, 'session/:session_id/network_connection'],
 
-            get_local_storage_item: [:get, 'session/:session_id/local_storage/key/:key'.freeze],
-            remove_local_storage_item: [:delete, 'session/:session_id/local_storage/key/:key'.freeze],
-            get_local_storage_keys: [:get, 'session/:session_id/local_storage'.freeze],
-            set_local_storage_item: [:post, 'session/:session_id/local_storage'.freeze],
-            clear_local_storage: [:delete, 'session/:session_id/local_storage'.freeze],
-            get_local_storage_size: [:get, 'session/:session_id/local_storage/size'.freeze],
+            get_local_storage_item: [:get, 'session/:session_id/local_storage/key/:key'],
+            remove_local_storage_item: [:delete, 'session/:session_id/local_storage/key/:key'],
+            get_local_storage_keys: [:get, 'session/:session_id/local_storage'],
+            set_local_storage_item: [:post, 'session/:session_id/local_storage'],
+            clear_local_storage: [:delete, 'session/:session_id/local_storage'],
+            get_local_storage_size: [:get, 'session/:session_id/local_storage/size'],
 
-            get_session_storage_item: [:get, 'session/:session_id/session_storage/key/:key'.freeze],
-            remove_session_storage_item: [:delete, 'session/:session_id/session_storage/key/:key'.freeze],
-            get_session_storage_keys: [:get, 'session/:session_id/session_storage'.freeze],
-            set_session_storage_item: [:post, 'session/:session_id/session_storage'.freeze],
-            clear_session_storage: [:delete, 'session/:session_id/session_storage'.freeze],
-            get_session_storage_size: [:get, 'session/:session_id/session_storage/size'.freeze],
+            get_session_storage_item: [:get, 'session/:session_id/session_storage/key/:key'],
+            remove_session_storage_item: [:delete, 'session/:session_id/session_storage/key/:key'],
+            get_session_storage_keys: [:get, 'session/:session_id/session_storage'],
+            set_session_storage_item: [:post, 'session/:session_id/session_storage'],
+            clear_session_storage: [:delete, 'session/:session_id/session_storage'],
+            get_session_storage_size: [:get, 'session/:session_id/session_storage/size'],
 
             #
             # ime
             #
 
-            ime_get_available_engines: [:get, 'session/:session_id/ime/available_engines'.freeze],
-            ime_get_active_engine: [:get, 'session/:session_id/ime/active_engine'.freeze],
-            ime_is_activated: [:get, 'session/:session_id/ime/activated'.freeze],
-            ime_deactivate: [:post, 'session/:session_id/ime/deactivate'.freeze],
-            ime_activate_engine: [:post, 'session/:session_id/ime/activate'.freeze],
+            ime_get_available_engines: [:get, 'session/:session_id/ime/available_engines'],
+            ime_get_active_engine: [:get, 'session/:session_id/ime/active_engine'],
+            ime_is_activated: [:get, 'session/:session_id/ime/activated'],
+            ime_deactivate: [:post, 'session/:session_id/ime/deactivate'],
+            ime_activate_engine: [:post, 'session/:session_id/ime/activate'],
 
             #
             # touch
             #
 
-            touch_single_tap: [:post, 'session/:session_id/touch/click'.freeze],
-            touch_double_tap: [:post, 'session/:session_id/touch/doubleclick'.freeze],
-            touch_long_press: [:post, 'session/:session_id/touch/longclick'.freeze],
-            touch_down: [:post, 'session/:session_id/touch/down'.freeze],
-            touch_up: [:post, 'session/:session_id/touch/up'.freeze],
-            touch_move: [:post, 'session/:session_id/touch/move'.freeze],
-            touch_scroll: [:post, 'session/:session_id/touch/scroll'.freeze],
-            touch_flick: [:post, 'session/:session_id/touch/flick'.freeze],
+            touch_single_tap: [:post, 'session/:session_id/touch/click'],
+            touch_double_tap: [:post, 'session/:session_id/touch/doubleclick'],
+            touch_long_press: [:post, 'session/:session_id/touch/longclick'],
+            touch_down: [:post, 'session/:session_id/touch/down'],
+            touch_up: [:post, 'session/:session_id/touch/up'],
+            touch_move: [:post, 'session/:session_id/touch/move'],
+            touch_scroll: [:post, 'session/:session_id/touch/scroll'],
+            touch_flick: [:post, 'session/:session_id/touch/flick'],
 
             #
             # logs
             #
 
-            get_available_log_types: [:get, 'session/:session_id/log/types'.freeze],
-            get_log: [:post, 'session/:session_id/log'.freeze]
+            get_available_log_types: [:get, 'session/:session_id/log/types'],
+            get_log: [:post, 'session/:session_id/log']
           }.freeze
 
         end # Bridge

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

@@ -1,3 +1,5 @@
+# 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
@@ -20,7 +22,7 @@ module Selenium
     module Remote
       # @api private
       class Response
-        STACKTRACE_KEY = 'stackTrace'.freeze
+        STACKTRACE_KEY = 'stackTrace'
 
         attr_reader :code, :payload
         attr_writer :payload
@@ -49,6 +51,7 @@ module Selenium
           when Hash
             msg = val['message']
             return 'unknown error' unless msg
+
             msg << ": #{val['alert']['text'].inspect}" if val['alert'].is_a?(Hash) && val['alert']['text']
             msg << " (#{val['class']})" if val['class']
             msg
@@ -69,12 +72,15 @@ module Selenium
           e = error
           raise e if e
           return unless @code.nil? || @code >= 400
+
           raise Error::ServerError, self
         end
 
         def add_backtrace(ex)
           return unless error_payload.is_a?(Hash)
 
+          # Legacy Firefox returns String in ['value'], while we expect Hash.
+          # Use #dig when Firefox legacy is removed (4.0).
           server_trace = error_payload[STACKTRACE_KEY] ||
                          error_payload[STACKTRACE_KEY.downcase] ||
                          (error_payload['value'] && error_payload['value'][STACKTRACE_KEY])
@@ -91,7 +97,7 @@ module Selenium
         end
 
         def backtrace_from_remote(server_trace)
-          server_trace.map do |frame|
+          server_trace.map { |frame|
             next unless frame.is_a?(Hash)
 
             file = frame['fileName']
@@ -104,7 +110,7 @@ module Selenium
             meth = 'unknown' if meth.nil? || meth.empty?
 
             "[remote server] #{file}:#{line}:in `#{meth}'"
-          end.compact
+          }.compact
         end
 
         def error_payload
@@ -115,11 +121,13 @@ module Selenium
 
         def status
           return unless error_payload.is_a? Hash
+
           @status ||= error_payload['status'] || error_payload['error']
         end
 
         def value
           return unless error_payload.is_a? Hash
+
           @value ||= error_payload['value'] || error_payload['message']
         end
       end # Response

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

@@ -1,3 +1,5 @@
+# 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

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

@@ -1,3 +1,5 @@
+# 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
@@ -116,6 +118,20 @@ module Selenium
                               'return source;')
           end
 
+          #
+          # Create a new top-level browsing context
+          # https://w3c.github.io/webdriver/#new-window
+          # @param type [String] Supports two values: 'tab' and 'window'.
+          #  Use 'tab' if you'd like the new window to share an OS-level window
+          #  with the current browsing context.
+          #  Use 'window' otherwise
+          # @return [Hash] Containing 'handle' with the value of the window handle
+          #  and 'type' with the value of the created window type
+          #
+          def new_window(type)
+            execute :new_window, {}, {type: type}
+          end
+
           def switch_to_window(name)
             execute :switch_to_window, {}, {handle: name}
           end
@@ -162,16 +178,14 @@ module Selenium
           end
 
           def resize_window(width, height, handle = :current)
-            unless handle == :current
-              raise Error::WebDriverError, 'Switch to desired window before changing its size'
-            end
+            raise Error::WebDriverError, 'Switch to desired window before changing its size' unless handle == :current
+
             set_window_rect(width: width, height: height)
           end
 
           def window_size(handle = :current)
-            unless handle == :current
-              raise Error::UnsupportedOperationError, 'Switch to desired window before getting its size'
-            end
+            raise Error::UnsupportedOperationError, 'Switch to desired window before getting its size' unless handle == :current
+
             data = execute :get_window_rect
 
             Dimension.new data['width'], data['height']
@@ -182,9 +196,8 @@ module Selenium
           end
 
           def maximize_window(handle = :current)
-            unless handle == :current
-              raise Error::UnsupportedOperationError, 'Switch to desired window before changing its size'
-            end
+            raise Error::UnsupportedOperationError, 'Switch to desired window before changing its size' unless handle == :current
+
             execute :maximize_window
           end
 
@@ -203,7 +216,7 @@ module Selenium
 
           def set_window_rect(x: nil, y: nil, width: nil, height: nil)
             params = {x: x, y: y, width: width, height: height}
-            params.update(params) { |k, v| Integer(v) unless v.nil? }
+            params.update(params) { |_k, v| Integer(v) unless v.nil? }
             execute :set_window_rect, {}, params
           end
 
@@ -302,8 +315,8 @@ module Selenium
           # cookies
           #
 
-          def options
-            @options ||= WebDriver::W3COptions.new(self)
+          def manage
+            @manage ||= WebDriver::W3CManager.new(self)
           end
 
           def add_cookie(cookie)
@@ -459,6 +472,7 @@ module Selenium
           end
 
           def element_attribute(element, name)
+            WebDriver.logger.info "Using script for :getAttribute of #{name}"
             execute_atom :getAttribute, element, name
           end
 
@@ -506,6 +520,7 @@ module Selenium
           end
 
           def element_displayed?(element)
+            WebDriver.logger.info 'Using script for :isDisplayed'
             execute_atom :isDisplayed, element
           end
 
@@ -569,7 +584,7 @@ module Selenium
             [how, what]
           end
 
-          ESCAPE_CSS_REGEXP = /(['"\\#.:;,!?+<>=~*^$|%&@`{}\-\[\]\(\)])/
+          ESCAPE_CSS_REGEXP = /(['"\\#.:;,!?+<>=~*^$|%&@`{}\-\[\]\(\)])/.freeze
           UNICODE_CODE_POINT = 30
 
           # Escapes invalid characters in CSS selector.

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

@@ -1,3 +1,5 @@
+# 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
@@ -29,7 +31,7 @@ module Selenium
 
         class Capabilities
 
-          EXTENSION_CAPABILITY_PATTERN = /\A[\w-]+:.*\z/
+          EXTENSION_CAPABILITY_PATTERN = /\A[\w-]+:.*\z/.freeze
 
           KNOWN = [
             :browser_name,
@@ -41,18 +43,19 @@ module Selenium
             :set_window_rect,
             :timeouts,
             :unhandled_prompt_behavior,
+            :strict_file_interactability,
 
             # remote-specific
             :remote_session_id,
 
-            # TODO (alex): deprecate in favor of Firefox::Options?
+            # TODO: (alex) deprecate in favor of Firefox::Options?
             :accessibility_checks,
             :device,
 
-            # TODO (alex): deprecate compatibility with OSS-capabilities
+            # TODO: (alex) deprecate compatibility with OSS-capabilities
             :implicit_timeout,
             :page_load_timeout,
-            :script_timeout,
+            :script_timeout
           ].freeze
 
           KNOWN.each do |key|
@@ -61,7 +64,14 @@ module Selenium
             end
 
             next if key == :proxy
+
             define_method "#{key}=" do |value|
+              case key
+              when :accessibility_checks
+                WebDriver.logger.deprecate(":accessibility_checks capability")
+              when :device
+                WebDriver.logger.deprecate(":device capability")
+              end
               @capabilities[key] = value
             end
           end
@@ -81,20 +91,15 @@ module Selenium
 
           class << self
             def edge(opts = {})
-              new({
-                browser_name: 'MicrosoftEdge',
-                platform: :windows
-              }.merge(opts))
+              WebDriver.logger.deprecate('Selenium::WebDriver::Remote::W3C::Capabilities.edge',
+                                         'Selenium::WebDriver::Remote::Capabilities.edge')
+              Remote::Capabilities.edge(opts)
             end
 
             def firefox(opts = {})
-              opts[:browser_version] = opts.delete(:version) if opts.key?(:version)
-              opts[:platform_name] = opts.delete(:platform) if opts.key?(:platform)
-              opts[:timeouts] = {}
-              opts[:timeouts]['implicit'] = opts.delete(:implicit_timeout) if opts.key?(:implicit_timeout)
-              opts[:timeouts]['pageLoad'] = opts.delete(:page_load_timeout) if opts.key?(:page_load_timeout)
-              opts[:timeouts]['script'] = opts.delete(:script_timeout) if opts.key?(:script_timeout)
-              new({browser_name: 'firefox', marionette: true}.merge(opts))
+              WebDriver.logger.deprecate('Selenium::WebDriver::Remote::W3C::Capabilities.firefox',
+                                         'Selenium::WebDriver::Remote::Capabilities.firefox')
+              Remote::Capabilities.firefox(opts)
             end
 
             alias_method :ff, :firefox
@@ -140,10 +145,10 @@ module Selenium
             # @param oss_capabilities [Hash, Remote::Capabilities]
             #
 
-            def from_oss(oss_capabilities)
+            def from_oss(oss_capabilities) # rubocop:disable Metrics/MethodLength
               w3c_capabilities = new
 
-              # TODO (alex): make capabilities enumerable?
+              # TODO: (alex) make capabilities enumerable?
               oss_capabilities = oss_capabilities.__send__(:capabilities) unless oss_capabilities.is_a?(Hash)
               oss_capabilities.each do |name, value|
                 next if value.nil?
@@ -163,11 +168,23 @@ module Selenium
 
               # User can pass :firefox_options or :firefox_profile.
               #
-              # TODO (alex): Refactor this whole method into converter class.
+              # TODO: (alex) Refactor this whole method into converter class.
               firefox_options = oss_capabilities['firefoxOptions'] || oss_capabilities['firefox_options'] || oss_capabilities[:firefox_options]
               firefox_profile = oss_capabilities['firefox_profile'] || oss_capabilities[:firefox_profile]
               firefox_binary  = oss_capabilities['firefox_binary'] || oss_capabilities[:firefox_binary]
 
+              if firefox_options
+                WebDriver.logger.deprecate(':firefox_options capabilitiy', 'Selenium::WebDriver::Firefox::Options')
+              end
+
+              if firefox_profile
+                WebDriver.logger.deprecate(':firefox_profile capabilitiy', 'Selenium::WebDriver::Firefox::Options#profile')
+              end
+
+              if firefox_binary
+                WebDriver.logger.deprecate(':firefox_binary capabilitiy', 'Selenium::WebDriver::Firefox::Options#binary')
+              end
+
               if firefox_profile && firefox_options
                 second_profile = firefox_options['profile'] || firefox_options[:profile]
                 if second_profile && firefox_profile != second_profile
@@ -250,9 +267,7 @@ module Selenium
                 if value
                   hash['proxy'] = value.as_json
                   hash['proxy']['proxyType'] &&= hash['proxy']['proxyType'].downcase
-                  if hash['proxy']['noProxy'].is_a?(String)
-                    hash['proxy']['noProxy'] = hash['proxy']['noProxy'].split(', ')
-                  end
+                  hash['proxy']['noProxy'] = hash['proxy']['noProxy'].split(', ') if hash['proxy']['noProxy'].is_a?(String)
                 end
               when String, :firefox_binary
                 hash[key.to_s] = value
@@ -272,6 +287,7 @@ module Selenium
 
           def ==(other)
             return false unless other.is_a? self.class
+
             as_json == other.as_json
           end