Support passing timeouts to capabilities

This allows to pass timeouts hash into capabilities constructor which
will ensure they are as part of new session payload. It also keeps
old per-timeout accessors in place which automatically handle conversion
from/to W3C capabilities.

Fixes #9345

Author: p0deje

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

@@ -40,22 +40,15 @@ class Capabilities
           :unhandled_prompt_behavior,
           :strict_file_interactability,
 
-          # remote-specific
-          :remote_session_id,
-
-          # TODO: (AR) deprecate compatibility with OSS-capabilities
-          :implicit_timeout,
-          :page_load_timeout,
-          :script_timeout
+          # remote-specific (webdriver.remote.sessionid)
+          :remote_session_id
         ].freeze
 
         KNOWN.each do |key|
           define_method key do
             @capabilities.fetch(key)
           end
 
-          next if key == :proxy
-
           define_method "#{key}=" do |value|
             @capabilities[key] = value
           end
@@ -89,16 +82,10 @@ def edge(opts = {})
           alias_method :microsoftedge, :edge
 
           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)
-            opts.delete(:timeouts) if opts[:timeouts].empty?
-            new({browser_name: 'firefox'}.merge(opts))
+            new({
+              browser_name: 'firefox'
+            }.merge(opts))
           end
-
           alias_method :ff, :firefox
 
           def safari(opts = {})
@@ -135,12 +122,7 @@ def first_match(*capabilities)
 
           def json_create(data)
             data = data.dup
-
             caps = new
-            (KNOWN - %i[timeouts proxy]).each do |cap|
-              data_value = camel_case(cap)
-              caps[cap] = data.delete(data_value) if data.key?(data_value)
-            end
 
             process_timeouts(caps, data.delete('timeouts'))
 
@@ -154,6 +136,11 @@ def json_create(data)
               caps[:remote_session_id] = data.delete('webdriver.remote.sessionid')
             end
 
+            KNOWN.each do |cap|
+              data_value = camel_case(cap)
+              caps[cap] = data.delete(data_value) if data.key?(data_value)
+            end
+
             # any remaining pairs will be added as is, with no conversion
             caps.merge!(data)
 
@@ -225,6 +212,34 @@ def proxy=(proxy)
           end
         end
 
+        def timeouts
+          @capabilities[:timeouts] ||= {}
+        end
+
+        def implicit_timeout
+          timeouts[:implicit]
+        end
+
+        def implicit_timeout=(timeout)
+          timeouts[:implicit] = timeout
+        end
+
+        def page_load_timeout
+          timeouts[:page_load] || timeouts[:pageLoad]
+        end
+
+        def page_load_timeout=(timeout)
+          timeouts[:page_load] = timeout
+        end
+
+        def script_timeout
+          timeouts[:script]
+        end
+
+        def script_timeout=(timeout)
+          timeouts[:script] = timeout
+        end
+
         #
         # @api private
         #

rb/spec/unit/selenium/webdriver/remote/capabilities_spec.rb

@@ -107,7 +107,13 @@ module Remote
         end
 
         it 'can be serialized and deserialized to JSON' do
-          caps = Capabilities.new(browser_name: 'firefox', 'extension:customCapability': true)
+          caps = Capabilities.new(browser_name: 'firefox',
+                                  timeouts: {
+                                    implicit: 1,
+                                    page_load: 2,
+                                    script: 3
+                                  },
+                                  'extension:customCapability': true)
           expect(caps).to eq(Capabilities.json_create(caps.as_json))
         end
 
@@ -126,6 +132,52 @@ module Remote
           expect(Capabilities.first_match(Capabilities.chrome, Capabilities.firefox).as_json).to eq(expected)
         end
       end
+
+      context 'timeouts' do
+        let(:as_json) do
+          {
+            'browserName' => 'chrome',
+            'timeouts' => {
+              'implicit' => 1,
+              'pageLoad' => 2,
+              'script' => 3
+            }
+          }
+        end
+
+        it 'processes timeouts as hash' do
+          caps = Capabilities.chrome(timeouts: {implicit: 1, page_load: 2, script: 3})
+          expect(caps.timeouts).to eq(implicit: 1, page_load: 2, script: 3)
+          expect(caps.implicit_timeout).to eq(1)
+          expect(caps.page_load_timeout).to eq(2)
+          expect(caps.script_timeout).to eq(3)
+          expect(caps.as_json).to eq(as_json)
+        end
+
+        it 'processes timeouts via timeouts reader' do
+          caps = Capabilities.chrome
+          caps.timeouts[:implicit] = 1
+          caps.timeouts[:page_load] = 2
+          caps.timeouts[:script] = 3
+          expect(caps.timeouts).to eq(implicit: 1, page_load: 2, script: 3)
+          expect(caps.implicit_timeout).to eq(1)
+          expect(caps.page_load_timeout).to eq(2)
+          expect(caps.script_timeout).to eq(3)
+          expect(caps.as_json).to eq(as_json)
+        end
+
+        it 'processes timeouts via per-timeout writers' do
+          caps = Capabilities.chrome
+          caps.implicit_timeout = 1
+          caps.page_load_timeout = 2
+          caps.script_timeout = 3
+          expect(caps.timeouts).to eq(implicit: 1, page_load: 2, script: 3)
+          expect(caps.implicit_timeout).to eq(1)
+          expect(caps.page_load_timeout).to eq(2)
+          expect(caps.script_timeout).to eq(3)
+          expect(caps.as_json).to eq(as_json)
+        end
+      end
     end # Remote
   end # WebDriver
 end # Selenium