Fix conflicts

Author: aguspe

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

@@ -95,6 +95,12 @@ def create(type: nil, context_id: nil)
           result['context']
         end
 
+        def set_viewport(context_id: nil, width: nil, height: nil, device_pixel_ratio: nil)
+          context_id ||= @bridge.window_handle
+          params = {context: context_id, viewport: {width:, height:}, device_pixel_ratio:}
+          @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

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

@@ -12,6 +12,8 @@ module Selenium
 
         def navigate: (String url, String? context_id) -> void
 
+        def set_viewport: (String context_id, Integer width, Integer height, Float device_pixel_ratio) -> Hash[nil, nil]
+
         def traverse_history: (Integer delta, String? context_id) -> void
 
         def reload: (String? context_id, ?ignore_cache: bool) -> void

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

@@ -74,6 +74,15 @@ class BiDi
           expect(handles).not_to include(window2)
         end
 
+        it 'sets the viewport' do
+          reset_driver!(web_socket_url: true) do |driver|
+            browsing_context = described_class.new(driver)
+            browsing_context.set_viewport(width: 800, height: 600, device_pixel_ratio: 2.0)
+            expect(driver.execute_script('return [window.innerWidth, window.innerHeight]')).to eq([800, 600])
+            expect(driver.execute_script('return window.devicePixelRatio')).to eq(2.0)
+          end
+        end
+
         it 'accepts users prompts without text' do
           reset_driver!(web_socket_url: true) do |driver|
             browsing_context = described_class.new(driver)