Merge branch 'trunk' into js-bidi-permissions-module

Author: navin772

common/geckodriver/geckodriver-support.json

@@ -1,5 +1,9 @@
 {
   "geckodriver-releases": [
+    {
+      "geckodriver-version": "0.36.0",
+      "min-firefox-version": 115
+    },
     {
       "geckodriver-version": "0.35.0",
       "min-firefox-version": 115

dotnet/src/support/UI/PopupWindowFinder.cs

@@ -131,7 +131,7 @@ public string Invoke(Action popupMethod)
 
             ReadOnlyCollection<string> existingHandles = this.driver.WindowHandles;
             popupMethod();
-            WebDriverWait wait = new WebDriverWait(new SystemClock(), this.driver, this.timeout, this.sleepInterval);
+            WebDriverWait wait = new WebDriverWait(SystemClock.Instance, this.driver, this.timeout, this.sleepInterval);
             string popupHandle = wait.Until<string>((d) =>
             {
                 string? foundHandle = null;

dotnet/src/support/UI/SlowLoadableComponent{T}.cs

@@ -43,7 +43,7 @@ public abstract class SlowLoadableComponent<T> : LoadableComponent<T>
         /// </summary>
         /// <param name="timeout">The <see cref="TimeSpan"/> within which the component should be loaded.</param>
         protected SlowLoadableComponent(TimeSpan timeout)
-            : this(timeout, new SystemClock())
+            : this(timeout, SystemClock.Instance)
         {
         }
 

dotnet/src/webdriver/Chrome/ChromeDriverService.cs

@@ -63,20 +63,22 @@ public static ChromeDriverService CreateDefaultService()
         /// </summary>
         /// <param name="driverPath">The path to the executable or the directory containing the ChromeDriver executable.</param>
         /// <returns>A ChromeDriverService using a random port.</returns>
-        public static ChromeDriverService CreateDefaultService(string driverPath)
+        public static ChromeDriverService CreateDefaultService(string? driverPath)
         {
-            string fileName;
             if (File.Exists(driverPath))
             {
-                fileName = Path.GetFileName(driverPath);
-                driverPath = Path.GetDirectoryName(driverPath)!;
+                string fileName = Path.GetFileName(driverPath);
+                string driverFolder = Path.GetDirectoryName(driverPath)!;
+
+                return CreateDefaultService(driverFolder, fileName);
             }
             else
             {
-                fileName = ChromiumDriverServiceFileName(DefaultChromeDriverServiceExecutableName);
-            }
+                string fileName = ChromiumDriverServiceFileName(DefaultChromeDriverServiceExecutableName);
+                string? driverFolder = driverPath;
 
-            return CreateDefaultService(driverPath, fileName);
+                return CreateDefaultService(driverFolder, fileName);
+            }
         }
 
         /// <summary>
@@ -85,7 +87,7 @@ public static ChromeDriverService CreateDefaultService(string driverPath)
         /// <param name="driverPath">The directory containing the ChromeDriver executable.</param>
         /// <param name="driverExecutableFileName">The name of the ChromeDriver executable file.</param>
         /// <returns>A ChromeDriverService using a random port.</returns>
-        public static ChromeDriverService CreateDefaultService(string driverPath, string driverExecutableFileName)
+        public static ChromeDriverService CreateDefaultService(string? driverPath, string? driverExecutableFileName)
         {
             return new ChromeDriverService(driverPath, driverExecutableFileName, PortUtilities.FindFreePort());
         }

dotnet/src/webdriver/Chromium/ChromiumOptions.cs

@@ -615,7 +615,7 @@ private static void AddAndroidOptions(Dictionary<string, object> chromeOptions,
 
             if (!string.IsNullOrEmpty(androidOptions.AndroidProcess))
             {
-                chromeOptions["androidProcess"] = androidOptions.AndroidProcess;
+                chromeOptions["androidProcess"] = androidOptions.AndroidProcess!;
             }
 
             if (androidOptions.UseRunningApp)

dotnet/src/webdriver/Command.cs

@@ -55,11 +55,12 @@ public Command(string name, string jsonParameters)
         /// <param name="sessionId">Session ID the driver is using</param>
         /// <param name="name">Name of the command</param>
         /// <param name="parameters">Parameters for that command</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="name"/> is <see langword="null"/>.</exception>
         public Command(SessionId? sessionId, string name, Dictionary<string, object>? parameters)
         {
             this.SessionId = sessionId;
             this.Parameters = parameters ?? new Dictionary<string, object>();
-            this.Name = name;
+            this.Name = name ?? throw new ArgumentNullException(nameof(name));
         }
 
         /// <summary>

dotnet/src/webdriver/CommandInfoRepository.cs

@@ -87,6 +87,7 @@ public bool IsCommandNameDefined(string commandName)
         /// </summary>
         /// <param name="commandName">The <see cref="DriverCommand"/> for which to get the information.</param>
         /// <returns>The <see cref="HttpCommandInfo"/> for the specified command, or <see langword="null"/> if not found or value is not <typeparamref name="T"/>.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="commandName"/> is <see langword="null"/>.</exception>
         public T? GetCommandInfo<T>(string commandName) where T : CommandInfo
         {
             T? toReturn = default;

dotnet/src/webdriver/Edge/EdgeDriverService.cs

@@ -72,22 +72,24 @@ public static EdgeDriverService CreateDefaultService()
         /// <summary>
         /// Creates a default instance of the EdgeDriverService using a specified path to the EdgeDriver executable.
         /// </summary>
-        /// <param name="driverPath">The directory containing the EdgeDriver executable.</param>
+        /// <param name="driverPath">The path to the executable or the directory containing the EdgeDriver executable.</param>
         /// <returns>An EdgeDriverService using a random port.</returns>
-        public static EdgeDriverService CreateDefaultService(string driverPath)
+        public static EdgeDriverService CreateDefaultService(string? driverPath)
         {
-            string fileName;
             if (File.Exists(driverPath))
             {
-                fileName = Path.GetFileName(driverPath);
-                driverPath = Path.GetDirectoryName(driverPath)!;
+                string fileName = Path.GetFileName(driverPath);
+                string driverFolder = Path.GetDirectoryName(driverPath)!;
+
+                return CreateDefaultService(driverFolder, fileName);
             }
             else
             {
-                fileName = ChromiumDriverServiceFileName(MSEdgeDriverServiceFileName);
-            }
+                string fileName = ChromiumDriverServiceFileName(MSEdgeDriverServiceFileName);
+                string? driverFolder = driverPath;
 
-            return CreateDefaultService(driverPath, fileName);
+                return CreateDefaultService(driverFolder, fileName);
+            }
         }
 
         /// <summary>
@@ -96,7 +98,7 @@ public static EdgeDriverService CreateDefaultService(string driverPath)
         /// <param name="driverPath">The directory containing the EdgeDriver executable.</param>
         /// <param name="driverExecutableFileName">The name of the EdgeDriver executable file.</param>
         /// <returns>A EdgeDriverService using a random port.</returns>
-        public static EdgeDriverService CreateDefaultService(string driverPath, string driverExecutableFileName)
+        public static EdgeDriverService CreateDefaultService(string? driverPath, string? driverExecutableFileName)
         {
             return new EdgeDriverService(driverPath, driverExecutableFileName, PortUtilities.FindFreePort());
         }