Merge branch 'trunk' into remote-session-settings-json

Author: RenderMichael

.github/workflows/bazel.yml

@@ -70,7 +70,7 @@ on:
 jobs:
   bazel:
     name: ${{ inputs.name }}
-    runs-on: ${{ inputs.os == 'macos' && 'macos-13' || format('{0}-latest', inputs.os) }}
+    runs-on: ${{ format('{0}-latest', inputs.os) }}
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       SEL_M2_USER: ${{ secrets.SEL_M2_USER }}

.github/workflows/ci-python.yml

@@ -16,7 +16,7 @@ jobs:
   docs:
     name: Documentation
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
   lint:
     name: Lint
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
   mypy:
     name: Mypy
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
@@ -81,19 +81,32 @@ jobs:
     name: Remote Tests
     needs: build
     uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - browser: firefox
     with:
-      name: Integration Tests (remote)
-      browser: firefox
-      cache-key: py-remote
+      name: Integration Tests (remote, ${{ matrix.browser }})
+      browser: ${{ matrix.browser }}
+      cache-key: py-remote-${{ matrix.browser }}
       run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
 
-  safari-tests:
-    name: Safari Tests
+  browser-tests:
+    name: Browser Tests
     needs: build
     uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - browser: safari
+            os: macos
+          - browser: chrome
+            os: macos
     with:
-      name: Integration Tests (safari)
-      browser: safari
-      os: macos
-      cache-key: py-safari
-      run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-safari
+      name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
+      browser: ${{ matrix.browser }}
+      os: ${{ matrix.os }}
+      cache-key: py-browser-${{ matrix.browser }}
+      run: bazel test --flaky_test_attempts 3 //py:test-${{ matrix.browser }}

.github/workflows/label-commenter.yml

@@ -12,7 +12,7 @@ permissions:
 jobs:
   comment:
     if: github.repository_owner == 'seleniumhq'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Label Commenter

common/src/web/formPage.html

@@ -80,6 +80,12 @@
         <option value="oranges">Oranges</option>
       </select>
 
+    <select id="invisible_multi_select" multiple>
+      <option selected="selected" value="apples" style="opacity: 0;">Apples</option>
+      <option value="oranges">Oranges</option>
+      <option selected="selected" value="lemons">Lemons</option>
+    </select>
+
     <select name="select-default">
         <option>One</option>
         <option>Two</option>

dotnet/src/webdriver/Command.cs

@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 
 namespace OpenQA.Selenium
 {
@@ -35,7 +36,7 @@ public class Command
 
         private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()
         {
-            TypeInfoResolver = CommandJsonSerializerContext.Default,
+            TypeInfoResolver = JsonTypeInfoResolver.Combine(CommandJsonSerializerContext.Default, new DefaultJsonTypeInfoResolver()),
             Converters = { new ResponseValueJsonConverter() }
         };
 

dotnet/src/webdriver/SeleniumManager.cs

@@ -40,8 +40,6 @@ public static class SeleniumManager
     {
         private static readonly ILogger _logger = Log.GetLogger(typeof(SeleniumManager));
 
-        private static readonly JsonSerializerOptions _serializerOptions = new() { PropertyNameCaseInsensitive = true, TypeInfoResolver = SeleniumManagerSerializerContext.Default };
-
         private static readonly Lazy<string> _lazyBinaryFullPath = new(() =>
         {
             string? binaryFullPath = Environment.GetEnvironmentVariable("SE_MANAGER_PATH");
@@ -187,7 +185,7 @@ private static ResultResponse RunCommand(string fileName, string arguments)
 
             try
             {
-                jsonResponse = JsonSerializer.Deserialize<SeleniumManagerResponse>(output, _serializerOptions)!;
+                jsonResponse = JsonSerializer.Deserialize(output, SeleniumManagerSerializerContext.Default.SeleniumManagerResponse)!;
             }
             catch (Exception ex)
             {
@@ -210,11 +208,11 @@ private static ResultResponse RunCommand(string fileName, string arguments)
         }
     }
 
-    internal record SeleniumManagerResponse(IReadOnlyList<LogEntryResponse> Logs, ResultResponse Result)
+    internal sealed record SeleniumManagerResponse(IReadOnlyList<LogEntryResponse> Logs, ResultResponse Result)
     {
-        public record LogEntryResponse(string Level, string Message);
+        public sealed record LogEntryResponse(string Level, string Message);
 
-        public record ResultResponse
+        public sealed record ResultResponse
         (
             [property: JsonPropertyName("driver_path")]
             string DriverPath,
@@ -224,5 +222,6 @@ string BrowserPath
     }
 
     [JsonSerializable(typeof(SeleniumManagerResponse))]
-    internal partial class SeleniumManagerSerializerContext : JsonSerializerContext;
+    [JsonSourceGenerationOptions(PropertyNameCaseInsensitive = true)]
+    internal sealed partial class SeleniumManagerSerializerContext : JsonSerializerContext;
 }

dotnet/test/common/CommandTests.cs

@@ -0,0 +1,41 @@
+// <copyright file="CommandTests.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 NUnit.Framework;
+using System.Collections.Generic;
+
+namespace OpenQA.Selenium
+{
+    [TestFixture]
+    public class CommandTests
+    {
+        [Test]
+        public void CommandSerializesAnonymousType()
+        {
+            var parameters = new Dictionary<string, object>
+            {
+                ["arg"] = new { param1 = true, param2 = false },
+            };
+
+            var command = new Command(new SessionId("session"), "test command", parameters);
+
+            Assert.That(command.ParametersAsJsonString, Is.EqualTo("""{"arg":{"param1":true,"param2":false}}"""));
+        }
+    }
+}

java/src/org/openqa/selenium/manager/SeleniumManager.java

@@ -194,7 +194,11 @@ private synchronized Path getBinary() {
         } else if (current.is(MAC)) {
           folder = "macos";
         } else if (current.is(LINUX)) {
-          folder = "linux";
+          if (System.getProperty("os.arch").contains("arm")) {
+            throw new WebDriverException("Linux ARM is not supported by Selenium Manager");
+          } else {
+            folder = "linux";
+          }
         } else if (current.is(UNIX)) {
           LOG.warning(
               String.format(

java/src/org/openqa/selenium/netty/server/NettyServer.java

@@ -27,6 +27,7 @@
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.SelfSignedCertificate;
+import io.netty.util.concurrent.Future;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 import io.netty.util.internal.logging.JdkLoggerFactory;
 import java.io.IOException;
@@ -127,8 +128,11 @@ public URL getUrl() {
   @Override
   public void stop() {
     try {
-      bossGroup.shutdownGracefully().sync();
-      workerGroup.shutdownGracefully().sync();
+      Future<?> bossShutdown = bossGroup.shutdownGracefully();
+      Future<?> workerShutdown = workerGroup.shutdownGracefully();
+
+      bossShutdown.sync();
+      workerShutdown.sync();
 
       channel.closeFuture().sync();
     } catch (InterruptedException e) {

java/src/org/openqa/selenium/remote/http/HttpMessage.java

@@ -29,11 +29,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import org.openqa.selenium.internal.Require;
 
 abstract class HttpMessage<M extends HttpMessage<M>> {
@@ -92,11 +90,8 @@ public Iterable<String> getHeaderNames() {
    * @return an iterable view of the values
    */
   public Iterable<String> getHeaders(String name) {
-    return headers.entrySet().stream()
-        .filter(e -> Objects.nonNull(e.getKey()))
-        .filter(e -> e.getKey().equalsIgnoreCase(name.toLowerCase()))
-        .flatMap((e) -> e.getValue().stream())
-        .collect(Collectors.toList());
+    return Collections.unmodifiableCollection(
+        headers.getOrDefault(name.toLowerCase(), Collections.emptyList()));
   }
 
   /**
@@ -106,12 +101,8 @@ public Iterable<String> getHeaders(String name) {
    * @return the value
    */
   public String getHeader(String name) {
-    return headers.entrySet().stream()
-        .filter(e -> Objects.nonNull(e.getKey()))
-        .filter(e -> e.getKey().equalsIgnoreCase(name.toLowerCase()))
-        .flatMap((e) -> e.getValue().stream())
-        .findFirst()
-        .orElse(null);
+    List<String> values = headers.getOrDefault(name.toLowerCase(), Collections.emptyList());
+    return !values.isEmpty() ? values.get(0) : null;
   }
 
   /**
@@ -123,7 +114,7 @@ public String getHeader(String name) {
    * @return self
    */
   public M setHeader(String name, String value) {
-    return removeHeader(name).addHeader(name, value);
+    return removeHeader(name.toLowerCase()).addHeader(name.toLowerCase(), value);
   }
 
   /**
@@ -135,7 +126,7 @@ public M setHeader(String name, String value) {
    * @return self
    */
   public M addHeader(String name, String value) {
-    headers.computeIfAbsent(name, (n) -> new ArrayList<>()).add(value);
+    headers.computeIfAbsent(name.toLowerCase(), (n) -> new ArrayList<>()).add(value);
     return self();
   }
 
@@ -146,7 +137,7 @@ public M addHeader(String name, String value) {
    * @return self
    */
   public M removeHeader(String name) {
-    headers.keySet().removeIf(header -> header.equalsIgnoreCase(name));
+    headers.remove(name.toLowerCase());
     return self();
   }