Merge branch 'trunk' into fix-install-data

Author: VietND96

dotnet/src/webdriver/BiDi/Communication/Command.cs

@@ -56,6 +56,7 @@ namespace OpenQA.Selenium.BiDi.Communication;
 [JsonDerivedType(typeof(Modules.Network.ProvideResponseCommand), "network.provideResponse")]
 [JsonDerivedType(typeof(Modules.Network.ContinueWithAuthCommand), "network.continueWithAuth")]
 [JsonDerivedType(typeof(Modules.Network.RemoveInterceptCommand), "network.removeIntercept")]
+[JsonDerivedType(typeof(Modules.Network.SetCacheBehaviorCommand), "network.setCacheBehavior")]
 
 [JsonDerivedType(typeof(Modules.Script.AddPreloadScriptCommand), "script.addPreloadScript")]
 [JsonDerivedType(typeof(Modules.Script.RemovePreloadScriptCommand), "script.removePreloadScript")]

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextNetworkModule.cs

@@ -69,6 +69,16 @@ public async Task<Intercept> InterceptAuthAsync(Func<AuthRequiredEventArgs, Task
         return intercept;
     }
 
+    public Task SetCacheBehaviorAsync(CacheBehavior behavior, BrowsingContextSetCacheBehaviorOptions? options = null)
+    {
+        SetCacheBehaviorOptions setCacheBehaviorOptions = new(options)
+        {
+            Contexts = [context]
+        };
+
+        return networkModule.SetCacheBehaviorAsync(behavior, setCacheBehaviorOptions);
+    }
+
     public Task<Subscription> OnBeforeRequestSentAsync(Func<BeforeRequestSentEventArgs, Task> handler, SubscriptionOptions? options = null)
     {
         return networkModule.OnBeforeRequestSentAsync(handler, new BrowsingContextsSubscriptionOptions(options) { Contexts = [context] });

dotnet/src/webdriver/BiDi/Modules/Network/NetworkModule.cs

@@ -68,6 +68,18 @@ public async Task<Intercept> InterceptResponseAsync(Func<ResponseStartedEventArg
         return intercept;
     }
 
+    public async Task SetCacheBehaviorAsync(CacheBehavior behavior, SetCacheBehaviorOptions? options = null)
+    {
+        var @params = new SetCacheBehaviorCommandParameters(behavior);
+
+        if (options is not null)
+        {
+            @params.Contexts = options.Contexts;
+        }
+
+        await Broker.ExecuteCommandAsync(new SetCacheBehaviorCommand(@params), options).ConfigureAwait(false);
+    }
+
     public async Task<Intercept> InterceptAuthAsync(Func<AuthRequiredEventArgs, Task> handler, AddInterceptOptions? interceptOptions = null, SubscriptionOptions? options = null)
     {
         var intercept = await AddInterceptAsync([InterceptPhase.AuthRequired], interceptOptions).ConfigureAwait(false);

dotnet/src/webdriver/BiDi/Modules/Network/SetCacheBehaviorCommand.cs

@@ -0,0 +1,58 @@
+// <copyright file="SetCacheBehaviorCommand.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using System.Collections.Generic;
+using OpenQA.Selenium.BiDi.Communication;
+
+#nullable enable
+
+namespace OpenQA.Selenium.BiDi.Modules.Network;
+
+internal class SetCacheBehaviorCommand(SetCacheBehaviorCommandParameters @params) : Command<SetCacheBehaviorCommandParameters>(@params);
+
+internal record SetCacheBehaviorCommandParameters(CacheBehavior CacheBehavior) : CommandParameters
+{
+    public IEnumerable<BrowsingContext.BrowsingContext>? Contexts { get; set; }
+}
+
+public record SetCacheBehaviorOptions : CommandOptions
+{
+    public SetCacheBehaviorOptions()
+    {
+
+    }
+
+    internal SetCacheBehaviorOptions(BrowsingContextSetCacheBehaviorOptions? options)
+    {
+
+    }
+
+    public IEnumerable<BrowsingContext.BrowsingContext>? Contexts { get; set; }
+}
+
+public record BrowsingContextSetCacheBehaviorOptions
+{
+
+}
+
+public enum CacheBehavior
+{
+    Default,
+    Bypass
+}

dotnet/test/common/BiDi/Network/NetworkTest.cs

@@ -211,4 +211,11 @@ public async Task CanFailRequest()
 
         Assert.That(action, Throws.TypeOf<BiDiException>().With.Message.Contain("net::ERR_FAILED").Or.Message.Contain("NS_ERROR_ABORT"));
     }
+
+    [Test]
+    public void CanSetCacheBehavior()
+    {
+        Assert.That(async () => await bidi.Network.SetCacheBehaviorAsync(CacheBehavior.Default), Throws.Nothing);
+        Assert.That(async () => await context.Network.SetCacheBehaviorAsync(CacheBehavior.Default), Throws.Nothing);
+    }
 }

java/CHANGELOG

@@ -1,3 +1,8 @@
+v4.28.1
+======
+* [java]: Add Locale.ROOT to avoid port formatting issues for all drivers (#15121)
+* [grid]: Grid UI could not open session live view (#15132)
+
 v4.28.0
 ======
 * Add CDP for Chrome 132 and remove 129

java/src/org/openqa/selenium/bidi/module/Network.java

@@ -19,6 +19,7 @@
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -30,6 +31,7 @@
 import org.openqa.selenium.bidi.HasBiDi;
 import org.openqa.selenium.bidi.network.AddInterceptParameters;
 import org.openqa.selenium.bidi.network.BeforeRequestSent;
+import org.openqa.selenium.bidi.network.CacheBehavior;
 import org.openqa.selenium.bidi.network.ContinueRequestParameters;
 import org.openqa.selenium.bidi.network.ContinueResponseParameters;
 import org.openqa.selenium.bidi.network.FetchError;
@@ -137,6 +139,22 @@ public void provideResponse(ProvideResponseParameters parameters) {
     this.bidi.send(new Command<>("network.provideResponse", parameters.toMap()));
   }
 
+  public void setCacheBehavior(CacheBehavior cacheBehavior) {
+    Require.nonNull("Cache behavior", cacheBehavior);
+    this.bidi.send(
+        new Command<>(
+            "network.setCacheBehavior", Map.of("cacheBehavior", cacheBehavior.toString())));
+  }
+
+  public void setCacheBehavior(CacheBehavior cacheBehavior, List<String> contexts) {
+    Require.nonNull("Cache behavior", cacheBehavior);
+    Require.nonNull("Contexts", contexts);
+    this.bidi.send(
+        new Command<>(
+            "network.setCacheBehavior",
+            Map.of("cacheBehavior", cacheBehavior.toString(), "contexts", contexts)));
+  }
+
   public void onBeforeRequestSent(Consumer<BeforeRequestSent> consumer) {
     if (browsingContextIds.isEmpty()) {
       this.bidi.addListener(beforeRequestSentEvent, consumer);

java/src/org/openqa/selenium/bidi/network/CacheBehavior.java

@@ -0,0 +1,34 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.bidi.network;
+
+public enum CacheBehavior {
+  DEFAULT("default"),
+  BYPASS("bypass");
+
+  private final String behavior;
+
+  CacheBehavior(String behavior) {
+    this.behavior = behavior;
+  }
+
+  @Override
+  public String toString() {
+    return behavior;
+  }
+}

java/test/org/openqa/selenium/bidi/network/NetworkCommandsTest.java

@@ -23,6 +23,7 @@
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
+import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Disabled;
@@ -32,6 +33,9 @@
 import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.UsernameAndPassword;
 import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.WindowType;
+import org.openqa.selenium.bidi.BiDiException;
+import org.openqa.selenium.bidi.browsingcontext.BrowsingContext;
 import org.openqa.selenium.bidi.module.Network;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.JupiterTestBase;
@@ -264,4 +268,56 @@ void canFailRequest() {
       assertThatThrownBy(() -> driver.get(page)).isInstanceOf(WebDriverException.class);
     }
   }
+
+  @Test
+  @NeedsFreshDriver
+  void canSetCacheBehaviorToBypass() {
+    try (Network network = new Network(driver)) {
+      page = appServer.whereIs("basicAuth");
+
+      BrowsingContext context = new BrowsingContext(driver, WindowType.TAB);
+      String contextId = context.getId();
+
+      network.setCacheBehavior(CacheBehavior.BYPASS, Collections.singletonList(contextId));
+    }
+  }
+
+  @Test
+  @NeedsFreshDriver
+  void canSetCacheBehaviorToDefault() {
+    try (Network network = new Network(driver)) {
+      page = appServer.whereIs("basicAuth");
+
+      BrowsingContext context = new BrowsingContext(driver, WindowType.TAB);
+      String contextId = context.getId();
+
+      network.setCacheBehavior(CacheBehavior.DEFAULT, Collections.singletonList(contextId));
+    }
+  }
+
+  @Test
+  @NeedsFreshDriver
+  void canSetCacheBehaviorWithNoContextId() {
+    try (Network network = new Network(driver)) {
+      page = appServer.whereIs("basicAuth");
+
+      network.setCacheBehavior(CacheBehavior.BYPASS);
+      network.setCacheBehavior(CacheBehavior.DEFAULT);
+    }
+  }
+
+  @Test
+  @NeedsFreshDriver
+  void throwsExceptionForInvalidContext() {
+    try (Network network = new Network(driver)) {
+      page = appServer.whereIs("basicAuth");
+
+      assertThatThrownBy(
+              () ->
+                  network.setCacheBehavior(
+                      CacheBehavior.DEFAULT, Collections.singletonList("invalid-context")))
+          .isInstanceOf(BiDiException.class)
+          .hasMessageContaining("no such frame");
+    }
+  }
 }

java/version.bzl

@@ -1,2 +1,2 @@
-SE_VERSION = "4.29.0-SNAPSHOT"
+SE_VERSION = "4.28.1"
 TOOLS_JAVA_VERSION = "17"