Deprecate Remote::W3C::Capabilities in favor of Remote::Capabilities

SeleniumHQ · Apr 17, 2019 · 64051c8 · 64051c8
1 parent 4d80728
commit 64051c8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 23 deletions.
diff --git a/rb/lib/selenium/webdriver/edge/driver.rb b/rb/lib/selenium/webdriver/edge/driver.rb
@@ -30,7 +30,7 @@ class Driver < WebDriver::Driver
         include DriverExtensions::TakesScreenshot
 
         def initialize(opts = {})
-          opts[:desired_capabilities] ||= Remote::W3C::Capabilities.edge
+          opts[:desired_capabilities] ||= Remote::Capabilities.edge
 
           opts[:url] ||= service_url(opts)
 

diff --git a/rb/lib/selenium/webdriver/firefox/legacy/driver.rb b/rb/lib/selenium/webdriver/firefox/legacy/driver.rb
@@ -33,7 +33,7 @@ class Driver < WebDriver::Driver
           def initialize(opts = {}) # rubocop:disable Metrics/AbcSize
             WebDriver.logger.deprecate 'Selenium support for legacy Firefox', 'Firefox via marionette'
 
-            opts[:desired_capabilities] ||= Remote::Capabilities.firefox
+            opts[:desired_capabilities] ||= Remote::Capabilities.firefox_legacy
 
             if opts.key? :proxy
               WebDriver.logger.deprecate ':proxy', "Selenium::WebDriver::Remote::Capabilities.firefox(proxy: #{opts[:proxy]})"

diff --git a/rb/lib/selenium/webdriver/firefox/marionette/driver.rb b/rb/lib/selenium/webdriver/firefox/marionette/driver.rb
@@ -61,7 +61,7 @@ def quit
           private
 
           def create_capabilities(opts)
-            caps = opts.delete(:desired_capabilities) { Remote::W3C::Capabilities.firefox }
+            caps = opts.delete(:desired_capabilities) { Remote::Capabilities.firefox }
             options = opts.delete(:options) { Options.new }
 
             firefox_options = opts.delete(:firefox_options)

diff --git a/rb/lib/selenium/webdriver/remote/capabilities.rb b/rb/lib/selenium/webdriver/remote/capabilities.rb
@@ -83,14 +83,21 @@ def chrome(opts = {})
           def edge(opts = {})
             new({
               browser_name: 'MicrosoftEdge',
-              platform: :windows,
-              javascript_enabled: true,
-              takes_screenshot: true,
-              css_selectors_enabled: true
+              platform: :windows
             }.merge(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))
+          end
+
+          def firefox_legacy(opts = {})
             new({
               browser_name: 'firefox',
               javascript_enabled: true,

diff --git a/rb/lib/selenium/webdriver/remote/w3c/capabilities.rb b/rb/lib/selenium/webdriver/remote/w3c/capabilities.rb
@@ -85,20 +85,15 @@ class Capabilities
 
           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

diff --git a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb
@@ -159,11 +159,6 @@ def remote_capabilities
 
           caps = WebDriver::Remote::Capabilities.send(browser_name, opt)
 
-          unless caps.is_a? WebDriver::Remote::W3C::Capabilities
-            caps.javascript_enabled = true
-            caps.css_selectors_enabled = true
-          end
-
           caps
         end