Fix conflicts

Author: aguspe

rb/lib/selenium/webdriver/bidi/browsing_context.rb

@@ -101,6 +101,10 @@ def set_viewport(context_id: nil, width: nil, height: nil, device_pixel_ratio: n
           @bidi.send_cmd('browsingContext.setViewport', **params)
         end
 
+        def handle_user_prompt(context_id, accept: true, text: nil)
+          @bidi.send_cmd('browsingContext.handleUserPrompt', context: context_id, accept: accept, text: text)
+        end
+
         def activate(context_id: nil)
           context_id ||= @bridge.window_handle
           @bidi.send_cmd('browsingContext.activate', context: context_id)

rb/sig/lib/selenium/webdriver/bidi/browsing_context.rbs

@@ -8,6 +8,8 @@ module Selenium
 
         def initialize: (Remote::Bridge bridge) -> void
 
+        def handle_user_prompt: (String context, bool accept, String text) -> untyped
+
         def activate: (String? context_id) -> Hash[nil, nil]
 
         def navigate: (String url, String? context_id) -> void

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

@@ -83,6 +83,39 @@ class BiDi
           end
         end
 
+        it 'accepts users prompts without text' do
+          reset_driver!(web_socket_url: true) do |driver|
+            browsing_context = described_class.new(driver)
+            window = browsing_context.create
+
+            browsing_context.handle_user_prompt(window, accept: true)
+
+            expect(driver.page_source).to include('hello')
+          end
+        end
+
+        it 'accepts users prompts with text' do
+          reset_driver!(web_socket_url: true) do |driver|
+            browsing_context = described_class.new(driver)
+            window = browsing_context.create
+
+            browsing_context.handle_user_prompt(window, accept: true, text: 'Hello, world!')
+
+            expect(driver.page_source).to include('hello')
+          end
+        end
+
+        it 'rejects users prompts' do
+          reset_driver!(web_socket_url: true) do |driver|
+            browsing_context = described_class.new(driver)
+            window = browsing_context.create
+
+            browsing_context.handle_user_prompt(window, accept: false)
+
+            expect(driver.page_source).to include('goodbye')
+          end
+        end
+
         it 'activates a browser context' do
           reset_driver!(web_socket_url: true) do |driver|
             browsing_context = described_class.new(driver)