Add ability to pass handlers to each different intercepted element

Author: aguspe

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

@@ -76,10 +76,10 @@ def cancel_auth(request_id)
           )
         end
 
-        def continue_with_request(**args)
+        def continue_request(**args)
           @bidi.send_cmd(
             'network.continueRequest',
-            request: args[:request_id],
+            request: args[:id],
             'body' => args[:body],
             'cookies' => args[:cookies],
             'headers' => args[:headers],
@@ -88,15 +88,22 @@ def continue_with_request(**args)
           )
         end
 
-        def continue_with_response(**args)
+        def fail_request(request_id)
+          @bidi.send_cmd(
+            'network.failRequest',
+            request: request_id
+          )
+        end
+
+        def continue_response(**args)
           @bidi.send_cmd(
             'network.continueResponse',
-            request: args[:response_id],
-            'body' => args[:body],
+            request: args[:id],
             'cookies' => args[:cookies],
             'credentials' => args[:credentials],
             'headers' => args[:headers],
-            'status' => args[:status]
+            'reasonPhrase' => args[:reason],
+            'statusCode' => args[:status]
           )
         end
 

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

@@ -23,22 +23,14 @@ class BiDi
       class InterceptedItem
         attr_reader :network, :request
 
-        def initialize(network, request)
-          @network = network
-          @request = request
+        def initialize(**args)
+          @network = args[:network]
+          @request = args[:request]
         end
 
         def id
           @id ||= @request['request']
         end
-
-        def headers
-          request['headers']
-        end
-
-        def headers=(new_headers)
-          request['headers'] = new_headers
-        end
       end
     end # BiDi
   end # WebDriver

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

@@ -21,8 +21,23 @@ module Selenium
   module WebDriver
     class BiDi
       class InterceptedRequest < InterceptedItem
+        attr_accessor :body, :cookies, :headers, :method, :url
+
+        def new(**args)
+          super(args[:network], args[:request])
+          @body = args[:body]
+          @cookies = args[:cookies]
+          @headers = args[:headers]
+          @method = args[:method]
+          @url = args[:url]
+        end
+
         def continue
-          network.continue_with_request(request_id: id)
+          network.continue_request(id:, body:, cookies:, headers:, method:, url:)
+        end
+
+        def fail
+          network.fail_request(id)
         end
       end
     end # BiDi

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

@@ -21,8 +21,18 @@ module Selenium
   module WebDriver
     class BiDi
       class InterceptedResponse < InterceptedItem
+        attr_accessor :cookies, :headers, :credentials, :reason
+
+        def new
+          super(args[:network], args[:request])
+          @cookies = args[:cookies]
+          @headers = args[:headers]
+          @credentials = args[:credentials]
+          @reason = args[:reason]
+        end
+
         def continue
-          network.continue_with_response(response_id: id)
+          network.continue_response(id:, cookies:, headers:, credentials:, reason:)
         end
       end
     end # BiDi

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

@@ -62,7 +62,7 @@ def add_handler(event_type, phase, intercept_type, &block)
         intercept = network.add_intercept(phases: [phase])
         callback_id = network.on(event_type) do |event|
           request = event['request']
-          intercepted_item = intercept_type.new(network, request)
+          intercepted_item = intercept_type.new(network: network, request: request)
           block.call(intercepted_item)
         end
 

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

@@ -84,27 +84,40 @@ class BiDi
           end
         end
 
-        it 'continues with request' do
+        it 'continues request' do
           reset_driver!(web_socket_url: true) do |driver|
             network = described_class.new(driver.bidi)
             network.add_intercept(phases: [described_class::PHASES[:before_request]])
             network.on(:before_request) do |event|
               request_id = event['request']['request']
-              network.continue_with_request(request_id: request_id)
+              network.continue_request(id: request_id)
             end
 
             driver.navigate.to url_for('formPage.html')
             expect(driver.find_element(name: 'login')).to be_displayed
           end
         end
 
-        it 'continues with response' do
+        it 'fails request' do
+          reset_driver!(web_socket_url: true) do |driver|
+            network = described_class.new(driver.bidi)
+            network.add_intercept(phases: [described_class::PHASES[:before_request]])
+            network.on(:before_request) do |event|
+              request_id = event['request']['request']
+              network.fail_request(request_id)
+            end
+
+            expect { driver.navigate.to url_for('formPage.html') }.to raise_error(Error::WebDriverError)
+          end
+        end
+
+        it 'continues response' do
           reset_driver!(web_socket_url: true) do |driver|
             network = described_class.new(driver.bidi)
             network.add_intercept(phases: [described_class::PHASES[:response_started]])
             network.on(:response_started) do |event|
               request_id = event['request']['request']
-              network.continue_with_response(request_id: request_id)
+              network.continue_response(id: request_id)
             end
 
             driver.navigate.to url_for('formPage.html')

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

@@ -89,6 +89,28 @@ module WebDriver
         end
       end
 
+      it 'adds a request handler with attributes' do
+        reset_driver!(web_socket_url: true) do |driver|
+          network = described_class.new(driver)
+          network.add_request_handler do |request|
+            request.method = 'GET'
+            request.continue
+          end
+          driver.navigate.to url_for('formPage.html')
+          expect(driver.find_element(name: 'login')).to be_displayed
+          expect(network.callbacks.count).to be 1
+        end
+      end
+
+      it 'fails a request' do
+        reset_driver!(web_socket_url: true) do |driver|
+          network = described_class.new(driver)
+          network.add_request_handler(&:fail)
+          expect(network.callbacks.count).to be 1
+          expect { driver.navigate.to url_for('formPage.html') }.to raise_error(Error::WebDriverError)
+        end
+      end
+
       it 'removes a request handler' do
         reset_driver!(web_socket_url: true) do |driver|
           network = described_class.new(driver)