Make auth handler more user friendly

Author: aguspe

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

@@ -44,8 +44,15 @@ def clear_handlers
         callbacks.each_key { |id| remove_handler(id) }
       end
 
-      def add_authentication_handler(&)
-        add_handler(:auth_required, BiDi::Network::PHASES[:auth_required], BiDi::InterceptedAuth, &)
+      def add_authentication_handler(username = nil, password = nil, &block)
+        selected_block =
+          if username && password
+            proc { |auth| auth.authenticate(username, password) }
+          else
+            block
+          end
+
+        add_handler(:auth_required, BiDi::Network::PHASES[:auth_required], BiDi::InterceptedAuth, &selected_block)
       end
 
       def add_request_handler(&)

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

@@ -29,9 +29,7 @@ module WebDriver
       it 'adds an auth handler' do
         reset_driver!(web_socket_url: true) do |driver|
           network = described_class.new(driver)
-          network.add_authentication_handler do |response|
-            response.authenticate(username, password)
-          end
+          network.add_authentication_handler(username, password)
           driver.navigate.to url_for('basicAuth')
           expect(driver.find_element(tag_name: 'h1').text).to eq('authorized')
           expect(network.callbacks.count).to be 1
@@ -41,9 +39,7 @@ module WebDriver
       it 'removes an auth handler' do
         reset_driver!(web_socket_url: true) do |driver|
           network = described_class.new(driver)
-          id = network.add_authentication_handler do |response|
-            response.authenticate(username, password)
-          end
+          id = network.add_authentication_handler(username, password)
           network.remove_handler(id)
           expect(network.callbacks.count).to be 0
         end
@@ -52,11 +48,7 @@ module WebDriver
       it 'clears all auth handlers' do
         reset_driver!(web_socket_url: true) do |driver|
           network = described_class.new(driver)
-          2.times do
-            network.add_authentication_handler do |response|
-              response.authenticate(username, password)
-            end
-          end
+          2.times { network.add_authentication_handler(username, password) }
           network.clear_handlers
           expect(network.callbacks.count).to be 0
         end