fix test

Author: aguspe

rb/lib/selenium/webdriver/common/driver.rb

@@ -320,23 +320,11 @@ def ref
       attr_reader :bridge
 
       def create_bridge(caps:, url:, http_client: nil)
-        if caps['webSocketUrl']
-          ws_options =
-            {
-              response_timeout: caps[:'ws:response_timeout'],
-              response_interval: caps[:'ws:response_interval']
-            }.compact
-
-          klass = Remote::BiDiBridge
-          bridge_opts = { http_client: http_client, url: url, ws_options: ws_options }
-        else
-          klass = Remote::Bridge
-          bridge_opts = { http_client: http_client, url: url }
-        end
+        klass = caps['webSocketUrl'] ? Remote::BiDiBridge : Remote::Bridge
 
-        klass.new(**bridge_opts).tap do |bridge|
-          bridge.create_session(caps)
-        end
+        bridge = klass.new(http_client: http_client, url: url)
+        bridge.create_session(caps)
+        bridge
       end
 
       def service_url(service)

rb/lib/selenium/webdriver/common/options.rb

@@ -26,7 +26,7 @@ class Options
 
       GRID_OPTIONS = %i[enable_downloads].freeze
 
-      WEBSOCKET_OPTIONS = %i[ws:response_timeout ws:response_interval].freeze
+      WEBSOCKET_OPTIONS = %i[web_socket_timeout web_socket_interval].freeze
 
       class << self
         attr_reader :driver_path
@@ -110,6 +110,8 @@ def as_json(*)
 
         downloads = options.delete(:enable_downloads)
         options['se:downloadsEnabled'] = downloads unless downloads.nil?
+        options['ws:response_timeout'] = options.delete(:web_socket_timeout) if options[:web_socket_timeout]
+        options['ws:response_interval'] = options.delete(:web_socket_interval) if options[:web_socket_interval]
         w3c_options = process_w3c_options(options)
 
         browser_options = self.class::CAPABILITIES.each_with_object({}) do |(capability_alias, capability_name), hash|

rb/lib/selenium/webdriver/remote/bidi_bridge.rb

@@ -23,15 +23,16 @@ module Remote
       class BiDiBridge < Bridge
         attr_reader :bidi
 
-        def initialize(url:, http_client: nil, ws_options: {})
-          super(url: url, http_client: http_client)
-          @ws_options = ws_options
-        end
-
         def create_session(capabilities)
           super
           socket_url = @capabilities[:web_socket_url]
-          @bidi = Selenium::WebDriver::BiDi.new(url: socket_url, options: @ws_options)
+
+          ws_options = {
+            response_timeout: capabilities['ws:responseTimeout'],
+            response_interval: capabilities['ws:responseInterval']
+          }.compact
+
+          @bidi = Selenium::WebDriver::BiDi.new(url: socket_url, options: ws_options)
         end
 
         def get(url)

rb/spec/integration/selenium/webdriver/bidi/browsing_context_spec.rb

@@ -133,21 +133,13 @@ class BiDi
           expect(driver.execute_script('return document.hasFocus();')).to be_truthy
         end
 
-        it 'times out if a bidi command takes too long to receive a response' do
-          reset_driver!(web_socket_url: true, 'ws:response_timeout': 1) do |driver|
+        it 'times out if a command takes too long' do
+          reset_driver!(web_socket_url: true, web_socket_timeout: 0.1, web_socket_interval: 1) do |driver|
             expect {
-              driver.navigate.to url_for('sleep?time=2')
+              driver.navigate.to url_for('sleep?time=0.2')
             }.to raise_error(Selenium::WebDriver::Error::TimeoutError)
           end
         end
-
-        it 'does not time out if a bidi command is fast enough' do
-          reset_driver!(web_socket_url: true, 'ws:response_timeout': 5) do |driver|
-            expect {
-              driver.navigate.to url_for('sleep?time=1')
-            }.not_to raise_error
-          end
-        end
       end
     end # BiDi
   end # WebDriver