Merge branch 'trunk' into js-bidi-getClientWindows

Author: harsha509

Rakefile

@@ -1110,7 +1110,11 @@ namespace :all do
              'rb/lib/selenium/webdriver/version.rb',
              'rb/CHANGES',
              'rb/Gemfile.lock',
-             'rust/CHANGELOG.md'])
+             'rust/CHANGELOG.md',
+             'rust/BUILD.bazel',
+             'rust/Cargo.Bazel.lock',
+             'rust/Cargo.toml',
+             'rust/Cargo.lock'])
   end
 
   desc 'Update all versions'
@@ -1122,6 +1126,7 @@ namespace :all do
     Rake::Task['node:version'].invoke(version)
     Rake::Task['py:version'].invoke(version)
     Rake::Task['dotnet:version'].invoke(version)
+    Rake::Task['rust:version'].invoke(version)
   end
 end
 
@@ -1186,7 +1191,11 @@ end
 
 def update_changelog(version, language, path, changelog, header)
   tag = previous_tag(version, language)
-  log = `git --no-pager log #{tag}...HEAD --pretty=format:"--> %B" --reverse #{path}`
+  if language == 'javascript'
+    log = `git --no-pager log #{tag}...HEAD --pretty=format:"- %s" --reverse #{path}`
+  else
+    log = `git --no-pager log #{tag}...HEAD --pretty=format:"* %s" --reverse #{path}`
+  end
   commits = log.split('>>>').map { |entry|
     lines = entry.split("\n")
     lines.reject! { |line| line.match?(/^(----|Co-authored|Signed-off)/) || line.empty? }

dotnet/src/webdriver/Remote/HttpCommandExecutor.cs

@@ -221,19 +221,39 @@ protected virtual void OnSendingRemoteHttpRequest(SendingRemoteHttpRequestEventA
             this.SendingRemoteHttpRequest?.Invoke(this, eventArgs);
         }
 
-        private HttpClient CreateHttpClient()
+        /// <summary>
+        /// Creates an instance of <see cref="HttpClientHandler"/> as underlying handler,
+        /// used by <see cref="CreateHttpClient"/>. Invoked only once when required.
+        /// </summary>
+        /// <returns>An instance of <see cref="HttpClientHandler"/>.</returns>
+        protected virtual HttpClientHandler CreateHttpClientHandler()
         {
-            HttpClientHandler httpClientHandler = new HttpClientHandler();
+            HttpClientHandler httpClientHandler = new();
+
             string userInfo = this.remoteServerUri.UserInfo;
-            if (!string.IsNullOrEmpty(userInfo) && userInfo.Contains(":"))
+
+            if (!string.IsNullOrEmpty(userInfo) && userInfo.Contains(':'))
             {
-                string[] userInfoComponents = this.remoteServerUri.UserInfo.Split(new char[] { ':' }, 2);
+                string[] userInfoComponents = this.remoteServerUri.UserInfo.Split([':'], 2);
                 httpClientHandler.Credentials = new NetworkCredential(userInfoComponents[0], userInfoComponents[1]);
                 httpClientHandler.PreAuthenticate = true;
             }
 
             httpClientHandler.Proxy = this.Proxy;
 
+            return httpClientHandler;
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="HttpClient"/> used by making all HTTP calls to remote end.
+        /// Invoked only once when required.
+        /// </summary>
+        /// <returns>An instance of <see cref="HttpClient"/>.</returns>
+        protected virtual HttpClient CreateHttpClient()
+        {
+            var httpClientHandler = CreateHttpClientHandler()
+                ?? throw new InvalidOperationException($"{nameof(CreateHttpClientHandler)} method returned null");
+
             HttpMessageHandler handler = httpClientHandler;
 
             if (_logger.IsEnabled(LogEventLevel.Trace))
@@ -242,15 +262,18 @@ private HttpClient CreateHttpClient()
             }
 
             var client = new HttpClient(handler);
+
             client.DefaultRequestHeaders.UserAgent.ParseAdd(this.UserAgent);
             client.DefaultRequestHeaders.Accept.ParseAdd(RequestAcceptHeader);
             client.DefaultRequestHeaders.ExpectContinue = false;
+
             if (!this.IsKeepAliveEnabled)
             {
                 client.DefaultRequestHeaders.Connection.ParseAdd("close");
             }
 
             client.Timeout = this.serverResponseTimeout;
+
             return client;
         }
 

rb/lib/selenium/webdriver/bidi/network.rb

@@ -124,6 +124,10 @@ def provide_response(**args)
           )
         end
 
+        def set_cache_behavior(behavior, *contexts)
+          @bidi.send_cmd('network.setCacheBehavior', cacheBehavior: behavior, contexts: contexts)
+        end
+
         def on(event, &)
           event = EVENTS[event] if event.is_a?(Symbol)
           @bidi.add_callback(event, &)

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

@@ -28,6 +28,8 @@ module Selenium
 
         def provide_response: -> Hash[nil, nil]
 
+        def set_cache_behavior: (String behavior, Array[BrowsingContext]) -> Hash[nil, nil]
+
         def on: (Symbol event) { (?) -> untyped } -> Hash[nil, nil]
       end
     end

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

@@ -176,6 +176,23 @@ class BiDi
             expect(source).to include('Hello World!')
           end
         end
+
+        it 'sets the cache to bypass' do
+          reset_driver!(web_socket_url: true) do |driver|
+            browsing_context = BrowsingContext.new(driver).create
+            network = described_class.new(driver.bidi)
+            network.set_cache_behavior('bypass', browsing_context)
+            expect(network.set_cache_behavior('bypass', browsing_context)).to be_a(Hash)
+          end
+        end
+
+        it 'sets the cache to default' do
+          reset_driver!(web_socket_url: true) do |driver|
+            browsing_context = BrowsingContext.new(driver).create
+            network = described_class.new(driver.bidi)
+            expect(network.set_cache_behavior('default', browsing_context)).to be_a(Hash)
+          end
+        end
       end
     end
   end