Merge branch 'trunk' into add-selenium-manager-linux-arm64

Author: cgoldberg

.gitignore

@@ -78,7 +78,6 @@ py/docs/source/**/*
 !py/docs/source/conf.py
 !py/docs/source/*.rst
 py/build/
-py/LICENSE
 py/pytestdebug.log
 py/python.iml
 selenium.egg-info/

README.md

@@ -528,8 +528,6 @@ To update API documentation for a specific language: `./go <language>:docs`
 
 To update all documentation: `./go all:docs`
 
-Note that JavaScript generation is [currently broken](https://github.com/SeleniumHQ/selenium/issues/10185).
-
 
 ## Releasing
 

dotnet/src/webdriver/Chromium/ChromiumDriver.cs

@@ -345,19 +345,6 @@ public DevToolsSession GetDevToolsSession(DevToolsOptions options)
         return this.devToolsSession;
     }
 
-    /// <summary>
-    /// Creates a session to communicate with a browser using the Chromium Developer Tools debugging protocol.
-    /// </summary>
-    /// <param name="devToolsProtocolVersion">The version of the Chromium Developer Tools protocol to use. Defaults to autodetect the protocol version.</param>
-    /// <returns>The active session to use to communicate with the Chromium Developer Tools debugging protocol.</returns>
-    [Obsolete("Use GetDevToolsSession(DevToolsOptions options)")]
-    [RequiresUnreferencedCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
-    [RequiresDynamicCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
-    public DevToolsSession GetDevToolsSession(int devToolsProtocolVersion)
-    {
-        return GetDevToolsSession(new DevToolsOptions() { ProtocolVersion = devToolsProtocolVersion });
-    }
-
     /// <summary>
     /// Closes a DevTools session.
     /// </summary>

dotnet/src/webdriver/Chromium/ChromiumDriverLogLevel.cs

@@ -0,0 +1,61 @@
+// <copyright file="ChromiumDriverLogLevel.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>
+
+namespace OpenQA.Selenium.Chromium;
+
+/// <summary>
+/// Represents the valid values of logging levels available with the Chromium based drivers.
+/// </summary>
+public enum ChromiumDriverLogLevel
+{
+    /// <summary>
+    /// Represents the value All, the most detailed logging level available.
+    /// </summary>
+    All,
+
+    /// <summary>
+    /// Represents the Debug value
+    /// </summary>
+    Debug,
+
+    /// <summary>
+    /// Represents the Info value
+    /// </summary>
+    Info,
+
+    /// <summary>
+    /// Represents the Warning value
+    /// </summary>
+    Warning ,
+
+    /// <summary>
+    /// Represents the Severe value
+    /// </summary>
+    Severe,
+
+    /// <summary>
+    /// Represents the Off value, nothing gets logged
+    /// </summary>
+    Off,
+
+    /// <summary>
+    /// Represents that the logging value is unspecified, and should be the default level.
+    /// </summary>
+    Default
+}

dotnet/src/webdriver/Chromium/ChromiumDriverService.cs

@@ -85,15 +85,9 @@ protected ChromiumDriverService(string? executablePath, string? executableFileNa
     public bool EnableAppendLog { get; set; }
 
     /// <summary>
-    /// <para>Gets or sets the comma-delimited list of IP addresses that are approved to connect to this instance of the Chrome driver.</para>
-    /// <para>A value of <see langword="null"/> or <see cref="string.Empty"/> means only the local loopback address can connect.</para>
+    /// Gets or sets the level at which log output is displayed.
     /// </summary>
-    [Obsolete($"Use {nameof(AllowedIPAddresses)}")]
-    public string? WhitelistedIPAddresses
-    {
-        get => this.AllowedIPAddresses;
-        set => this.AllowedIPAddresses = value;
-    }
+    public ChromiumDriverLogLevel LogLevel { get; set; } = ChromiumDriverLogLevel.Default;
 
     /// <summary>
     /// <para>Gets or sets the comma-delimited list of IP addresses that are approved to connect to this instance of the Chrome driver.</para>
@@ -154,6 +148,15 @@ protected override string CommandLineArguments
                 argsBuilder.Append(string.Format(CultureInfo.InvariantCulture, " -allowed-ips={0}", this.AllowedIPAddresses));
             }
 
+            if (this.LogLevel != ChromiumDriverLogLevel.Default)
+            {
+                if (Enum.IsDefined(typeof(ChromiumDriverLogLevel), this.LogLevel))
+                {
+                    argsBuilder.Append(string.Format(CultureInfo.InvariantCulture, " --log-level={0}", this.LogLevel.ToString().ToUpperInvariant()));
+                }
+            }
+
+
             return argsBuilder.ToString();
         }
     }

dotnet/src/webdriver/DevTools/DevToolsSession.cs

@@ -62,13 +62,6 @@ public class DevToolsSession : IDevToolsSession
 
     private readonly static ILogger logger = Internal.Logging.Log.GetLogger<DevToolsSession>();
 
-    /// <summary>
-    /// Initializes a new instance of the DevToolsSession class, using the specified WebSocket endpoint.
-    /// </summary>
-    /// <param name="endpointAddress"></param>
-    [Obsolete("Use DevToolsSession(string endpointAddress, DevToolsOptions options)")]
-    public DevToolsSession(string endpointAddress) : this(endpointAddress, new DevToolsOptions()) { }
-
     /// <summary>
     /// Initializes a new instance of the DevToolsSession class, using the specified WebSocket endpoint and specified DevTools options.
     /// </summary>

dotnet/src/webdriver/DevTools/IDevTools.cs

@@ -50,16 +50,6 @@ public interface IDevTools
     [RequiresDynamicCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
     DevToolsSession GetDevToolsSession(DevToolsOptions options);
 
-    /// <summary>
-    /// Creates a session to communicate with a browser using a specific version of the Developer Tools debugging protocol.
-    /// </summary>
-    /// <param name="protocolVersion">The specific version of the Developer Tools debugging protocol to use.</param>
-    /// <returns>The active session to use to communicate with the Developer Tools debugging protocol.</returns>
-    [Obsolete("Use GetDevToolsSession(DevToolsOptions options)")]
-    [RequiresUnreferencedCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
-    [RequiresDynamicCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
-    DevToolsSession GetDevToolsSession(int protocolVersion);
-
     /// <summary>
     /// Closes a DevTools session
     /// </summary>

dotnet/src/webdriver/Edge/EdgeDriverService.cs

@@ -48,16 +48,6 @@ protected override DriverOptions GetDefaultDriverOptions()
         return new EdgeOptions();
     }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the service should use verbose logging.
-    /// </summary>
-    [Obsolete("Use EnableVerboseLogging")]
-    public bool UseVerboseLogging
-    {
-        get => this.EnableVerboseLogging;
-        set => this.EnableVerboseLogging = value;
-    }
-
     /// <summary>
     /// Creates a default instance of the EdgeDriverService.
     /// </summary>

dotnet/src/webdriver/Firefox/FirefoxOptions.cs

@@ -98,16 +98,6 @@ public FirefoxOptions()
     /// </summary>
     public override string? BinaryLocation { get; set; }
 
-    /// <summary>
-    /// Gets or sets the path and file name of the Firefox browser executable.
-    /// </summary>
-    [Obsolete("Use BinaryLocation property instead of BrowserExecutableLocation. This one will be removed soon.")]
-    public string? BrowserExecutableLocation
-    {
-        get => this.BinaryLocation;
-        set => this.BinaryLocation = value;
-    }
-
     /// <summary>
     /// Gets or sets the logging level of the Firefox driver.
     /// </summary>

dotnet/src/webdriver/Interactions/ActionSequence.cs

@@ -60,13 +60,6 @@ public ActionSequence(InputDevice device, int initialSize)
     /// </summary>
     public int Count => this.interactions.Count;
 
-    /// <summary>
-    /// Gets the input device for this Action sequence.
-    /// </summary>
-    [Obsolete("This property has been renamed to InputDevice and will be removed in a future version")]
-    [CLSCompliant(false)]
-    public InputDevice inputDevice => InputDevice;
-
     /// <summary>
     /// Gets the input device for this Action sequence.
     /// </summary>