Merge branch 'trunk' into rb_add_support_for_chrome_beta

Author: aguspe

dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/LogEntryConverter.cs

@@ -34,7 +34,7 @@ internal class LogEntryConverter : JsonConverter<Modules.Log.LogEntry>
         {
             "console" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<ConsoleLogEntry>()),
             "javascript" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<JavascriptLogEntry>()),
-            _ => null,
+            _ => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<GenericLogEntry>()),
         };
     }
 

dotnet/src/webdriver/BiDi/Modules/Log/LogEntry.cs

@@ -24,6 +24,7 @@ namespace OpenQA.Selenium.BiDi.Modules.Log;
 
 // https://github.com/dotnet/runtime/issues/72604
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
+//[JsonDerivedType(typeof(GenericLogEntry))] // Fallback when discriminator is not recognized, we have to double check
 //[JsonDerivedType(typeof(ConsoleLogEntry), "console")]
 //[JsonDerivedType(typeof(JavascriptLogEntry), "javascript")]
 public abstract record LogEntry(BiDi BiDi, Level Level, Script.Source Source, string Text, DateTimeOffset Timestamp)
@@ -32,6 +33,9 @@ public abstract record LogEntry(BiDi BiDi, Level Level, Script.Source Source, st
     public Script.StackTrace? StackTrace { get; set; }
 }
 
+public record GenericLogEntry(BiDi BiDi, string Type, Level Level, Script.Source Source, string Text, DateTimeOffset Timestamp)
+    : LogEntry(BiDi, Level, Source, Text, Timestamp);
+
 public record ConsoleLogEntry(BiDi BiDi, Level Level, Script.Source Source, string Text, DateTimeOffset Timestamp, string Method, IReadOnlyList<Script.RemoteValue> Args)
     : LogEntry(BiDi, Level, Source, Text, Timestamp);
 

java/src/org/openqa/selenium/grid/data/DefaultSlotMatcher.java

@@ -49,7 +49,7 @@ public class DefaultSlotMatcher implements SlotMatcher, Serializable {
    matched in the Node or in the browser driver.
   */
   private static final List<String> EXTENSION_CAPABILITIES_PREFIXES =
-      Arrays.asList("goog:", "moz:", "ms:", "se:");
+      Arrays.asList("goog:", "moz:", "ms:", "safari:", "se:");
 
   @Override
   public boolean matches(Capabilities stereotype, Capabilities capabilities) {
@@ -154,9 +154,12 @@ private Boolean extensionCapabilitiesMatch(Capabilities stereotype, Capabilities
      We match extension capabilities when they are not prefixed with any of the
      EXTENSION_CAPABILITIES_PREFIXES items. Also, we match them only when the capabilities
      of the new session request contains that specific extension capability.
+     We are also filtering "options" extension capabilities, as they should be handled
+     by the remote endpoint.
     */
     return stereotype.getCapabilityNames().stream()
         .filter(name -> name.contains(":"))
+        .filter(name -> !name.toLowerCase().contains("options"))
         .filter(name -> capabilities.asMap().containsKey(name))
         .filter(name -> EXTENSION_CAPABILITIES_PREFIXES.stream().noneMatch(name::contains))
         .map(

java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java

@@ -565,6 +565,32 @@ void vendorExtensionPrefixedCapabilitiesAreIgnoredForMatching() {
     assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
   }
 
+  @Test
+  void extensionPrefixedOptionCapabilityIsIgnoredForMatching() {
+    Capabilities stereotype =
+        new ImmutableCapabilities(
+            CapabilityType.BROWSER_NAME,
+            "chrome",
+            CapabilityType.BROWSER_VERSION,
+            "84",
+            CapabilityType.PLATFORM_NAME,
+            Platform.WINDOWS,
+            "node:options",
+            "appium");
+
+    Capabilities capabilities =
+        new ImmutableCapabilities(
+            CapabilityType.BROWSER_NAME,
+            "chrome",
+            CapabilityType.BROWSER_VERSION,
+            "84",
+            CapabilityType.PLATFORM_NAME,
+            Platform.WINDOWS,
+            "node:options",
+            "selenium");
+    assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
+  }
+
   @Test
   void emptyCapabilitiesDoNotMatch() {
     Capabilities stereotype =

rb/lib/selenium/webdriver/support/guards.rb

@@ -39,6 +39,7 @@ def initialize(example, bug_tracker: '', conditions: nil)
 
         def add_condition(name, condition = nil, &block)
           @guard_conditions << GuardCondition.new(name, condition, &block)
+          WebDriver.logger.info "Running with Guard '#{name}' set to: #{!!condition}"
         end
 
         def add_message(name, message)