Implement single type of callbacks

Author: aguspe

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

@@ -20,12 +20,11 @@
 module Selenium
   module WebDriver
     class Network
-      attr_reader :auth_callbacks, :request_callbacks
+      attr_reader :callbacks
 
       def initialize(bridge)
         @network = BiDi::Network.new(bridge.bidi)
-        @auth_callbacks = {}
-        @request_callbacks = {}
+        @callbacks = {}
       end
 
       def add_authentication_handler(username, password)
@@ -34,19 +33,19 @@ def add_authentication_handler(username, password)
           request_id = event['requestId']
           @network.continue_with_auth(request_id, username, password)
         end
-        @auth_callbacks[auth_id] = intercept
+        @callbacks[auth_id] = intercept
 
         auth_id
       end
 
       def remove_authentication_handler(id)
-        intercept = @auth_callbacks[id]
+        intercept = @callbacks[id]
         @network.remove_intercept(intercept['intercept'])
-        @auth_callbacks.delete(id)
+        @callbacks.delete(id)
       end
 
       def clear_authentication_handlers
-        @auth_callbacks.each_key { |id| remove_authentication_handler(id) }
+        @callbacks.each_key { |id| remove_authentication_handler(id) }
       end
 
       def add_request_handler
@@ -56,19 +55,19 @@ def add_request_handler
           @network.continue_with_request(request_id: request_id)
         end
 
-        @request_callbacks[request_id] = intercept
+        @callbacks[request_id] = intercept
 
         request_id
       end
 
       def remove_request_handler(id)
-        intercept = @request_callbacks[id]
+        intercept = @callbacks[id]
         @network.remove_intercept(intercept['intercept'])
-        @request_callbacks.delete(id)
+        @callbacks.delete(id)
       end
 
       def clear_request_handlers
-        @request_callbacks.each_key { |id| remove_request_handler(id) }
+        @callbacks.each_key { |id| remove_request_handler(id) }
       end
     end # Network
   end # WebDriver

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

@@ -3,9 +3,9 @@ module Selenium
     class Network
       @network: BiDi::Network
 
-      @request_callbacks: untyped
+      @callbacks: Hash[String, String]
 
-      attr_reader auth_callbacks: Hash[String, String]
+      attr_reader callbacks: Hash[String, String]
 
       def initialize: (Remote::Bridge bridge) -> void
 

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

@@ -31,7 +31,7 @@ module WebDriver
         reset_driver!(web_socket_url: true) do |driver|
           network = described_class.new(driver)
           network.add_authentication_handler(username, password)
-          expect(network.auth_callbacks.count).to be 1
+          expect(network.callbacks.count).to be 1
         end
       end
 
@@ -40,7 +40,7 @@ module WebDriver
           network = described_class.new(driver)
           id = network.add_authentication_handler(username, password)
           network.remove_authentication_handler(id)
-          expect(network.auth_callbacks.count).to be 0
+          expect(network.callbacks.count).to be 0
         end
       end
 
@@ -50,15 +50,15 @@ module WebDriver
           network.add_authentication_handler(username, password)
           network.add_authentication_handler(username, password)
           network.clear_authentication_handlers
-          expect(network.auth_callbacks.count).to be 0
+          expect(network.callbacks.count).to be 0
         end
       end
 
       it 'adds a request handler' do
         reset_driver!(web_socket_url: true) do |driver|
           network = described_class.new(driver)
           network.add_request_handler
-          expect(network.request_callbacks.count).to be 1
+          expect(network.callbacks.count).to be 1
         end
       end
 
@@ -67,7 +67,7 @@ module WebDriver
           network = described_class.new(driver)
           id = network.add_request_handler
           network.remove_request_handler(id)
-          expect(network.request_callbacks.count).to be 0
+          expect(network.callbacks.count).to be 0
         end
       end
 
@@ -77,7 +77,7 @@ module WebDriver
           network.add_request_handler
           network.add_request_handler
           network.clear_request_handlers
-          expect(network.request_callbacks.count).to be 0
+          expect(network.callbacks.count).to be 0
         end
       end
     end