Merge branch 'trunk' into dotnet-nullable

Author: RenderMichael

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

@@ -94,6 +94,12 @@ def create(type: nil, context_id: nil)
           result = @bidi.send_cmd('browsingContext.create', type: type.to_s, referenceContext: context_id)
           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
       end
     end # BiDi
   end # WebDriver

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

@@ -10,6 +10,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

@@ -73,6 +73,15 @@ class BiDi
           expect(handles).to include(window1)
           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
       end
     end # BiDi
   end # WebDriver

rust/src/metadata.rs

@@ -23,7 +23,6 @@ use std::fs::File;
 use std::path::{Path, PathBuf};
 use std::time::{SystemTime, UNIX_EPOCH};
 
-const METADATA_FILE_OLD: &str = "selenium-manager.json";
 const METADATA_FILE: &str = "se-metadata.json";
 
 #[derive(Serialize, Deserialize)]
@@ -61,10 +60,6 @@ pub struct Metadata {
 }
 
 fn get_metadata_path(cache_path: PathBuf) -> PathBuf {
-    let old_metadata = cache_path.join(METADATA_FILE_OLD);
-    if old_metadata.exists() {
-        fs::remove_file(old_metadata).unwrap_or_default();
-    }
     cache_path.join(METADATA_FILE)
 }