Finish implementation

Author: aguspe

rb/lib/selenium/webdriver/bidi/network.rb

@@ -77,7 +77,7 @@ def cancel_auth(request_id)
         end
 
         def continue_with_request(**args)
-          response = @bidi.send_cmd(
+          @bidi.send_cmd(
             'network.continueRequest',
             request: args[:request_id],
             'body' => args[:body],
@@ -86,7 +86,6 @@ def continue_with_request(**args)
             'method' => args[:method],
             'url' => args[:url]
           )
-          response.inspect
         end
 
         def continue_with_response(**args)

rb/lib/selenium/webdriver/common/network.rb

@@ -17,11 +17,17 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'forwardable'
+
 module Selenium
   module WebDriver
     class Network
+      extend Forwardable
+
       attr_reader :callbacks, :network
 
+      def_delegators :network, :continue_with_auth, :continue_with_request, :continue_with_response
+
       def initialize(bridge)
         @network = BiDi::Network.new(bridge.bidi)
         @callbacks = {}
@@ -40,37 +46,35 @@ def clear_handlers
       def add_authentication_handler(username, password)
         intercept = network.add_intercept(phases: [Selenium::WebDriver::BiDi::Network::PHASES[:auth_required]])
         auth_id = network.on(:auth_required) do |event|
-          request_id = event['request']['request']
+          request_id = fetch_id(event)
           network.continue_with_auth(request_id, username, password)
         end
 
         callbacks[auth_id] = intercept
         auth_id
       end
 
-      def add_request_handler
+      def add_request_handler(&)
         intercept = network.add_intercept(phases: [BiDi::Network::PHASES[:before_request]])
-        request_id = network.on(:before_request) do |event|
-          request_id = event['request']['request']
-          network.continue_with_request(request_id: request_id)
-        end
+        request_id = network.on(:before_request, &)
 
         callbacks[request_id] = intercept
 
         request_id
       end
 
-      def add_response_handler
+      def add_response_handler(&)
         intercept = network.add_intercept(phases: [BiDi::Network::PHASES[:response_started]])
-        response_id = network.on(:response_started) do |event|
-          request_id = event['request']['request']
-          network.continue_with_response(request_id: request_id)
-        end
+        response_id = network.on(:response_started, &)
 
         callbacks[response_id] = intercept
 
         response_id
       end
+
+      def fetch_id(event)
+        event['request']['request']
+      end
     end # Network
   end # WebDriver
 end # Selenium

rb/sig/lib/selenium/webdriver/common/network.rbs

@@ -19,6 +19,8 @@ module Selenium
 
       def clear_handlers: -> Hash[nil, nil]
 
+      def fetch_id: -> String
+
       def remove_handler: (Integer id) -> nil
     end
   end

rb/spec/integration/selenium/webdriver/network_spec.rb

@@ -58,7 +58,7 @@ module WebDriver
       it 'adds a request handler' do
         reset_driver!(web_socket_url: true) do |driver|
           network = described_class.new(driver)
-          network.add_request_handler
+          network.add_request_handler { |event| network.continue_with_request(request_id: network.fetch_id(event)) }
           driver.navigate.to url_for('formPage.html')
           expect(driver.find_element(name: 'login')).to be_displayed
           expect(network.callbacks.count).to be 1
@@ -87,7 +87,7 @@ module WebDriver
       it 'adds a response handler' do
         reset_driver!(web_socket_url: true) do |driver|
           network = described_class.new(driver)
-          network.add_response_handler
+          network.add_response_handler { |event| network.continue_with_response(request_id: network.fetch_id(event)) }
           driver.navigate.to url_for('formPage.html')
           expect(driver.find_element(name: 'login')).to be_displayed
           expect(network.callbacks.count).to be 1