Merge branch 'trunk' of https://github.com/AdamPDotty/selenium into pr/14482

Author: pujagani

.github/workflows/ci-python.yml

@@ -20,10 +20,10 @@ jobs:
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -40,10 +40,10 @@ jobs:
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -62,10 +62,10 @@ jobs:
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.github/workflows/nightly.yml

@@ -172,7 +172,7 @@ jobs:
     with:
       name: Nightly JavaScript Release
       cache-key: javascript-nightly
-      node-version: '18.x'
+      node-version: '22.x'
       run: |
         sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/node/selenium-webdriver/package.json
         sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/node/selenium-webdriver/package.json

.github/workflows/update-documentation.yml

@@ -107,10 +107,10 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

MODULE.bazel

@@ -111,11 +111,11 @@ use_repo(oci, "chrome_standalone", "firefox_standalone", "java_image_base")
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(
     is_default = True,
-    python_version = "3.8",
+    python_version = "3.9",
 )
-python.toolchain(python_version = "3.9")
 python.toolchain(python_version = "3.10")
 python.toolchain(python_version = "3.11")
+python.toolchain(python_version = "3.12")
 use_repo(python, "pythons_hub")
 
 pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
@@ -127,10 +127,10 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
         requirements_lock = "//py:requirements_lock.txt",
     )
     for version in [
-        "3.8",
         "3.9",
         "3.10",
         "3.11",
+        "3.12",
     ]
 ]
 
@@ -216,7 +216,7 @@ maven.install(
         "org.junit.platform:junit-platform-reporting",
         "org.junit.platform:junit-platform-commons",
         "org.junit.platform:junit-platform-engine",
-        "org.mockito:mockito-core:5.14.2",
+        "org.mockito:mockito-core:5.15.2",
         "org.redisson:redisson:3.41.0",
         "org.slf4j:slf4j-api:2.0.16",
         "org.slf4j:slf4j-jdk14:2.0.16",

dotnet/src/webdriver/CookieJar.cs

@@ -74,16 +74,16 @@ public void AddCookie(Cookie cookie)
         /// Delete the cookie by passing in the name of the cookie
         /// </summary>
         /// <param name="name">The name of the cookie that is in the browser</param>
-        /// <exception cref="ArgumentNullException">If <paramref name="name"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="name"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>
         public void DeleteCookieNamed(string name)
         {
-            if (name is null)
+            if (string.IsNullOrWhiteSpace(name))
             {
-                throw new ArgumentNullException(nameof(name));
+                throw new ArgumentException("Cookie name cannot be null or empty", nameof(name));
             }
 
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("name", name);
+            Dictionary<string, object> parameters = new() { { "name", name } };
+
             driver.InternalExecute(DriverCommand.DeleteCookie, parameters);
         }
 
@@ -115,11 +115,12 @@ public void DeleteAllCookies()
         /// </summary>
         /// <param name="name">name of the cookie that needs to be returned</param>
         /// <returns>A Cookie from the name; or <see langword="null"/> if not found.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="name"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>
         public Cookie? GetCookieNamed(string name)
         {
             if (string.IsNullOrWhiteSpace(name))
             {
-                throw new ArgumentException("Cookie name cannot be empty", nameof(name));
+                throw new ArgumentException("Cookie name cannot be null or empty", nameof(name));
             }
 
             try

dotnet/src/webdriver/Firefox/FirefoxExtension.cs

@@ -25,7 +25,7 @@
 using System.Text.Json.Nodes;
 using System.Xml;
 
-
+#nullable enable
 
 namespace OpenQA.Selenium.Firefox
 {
@@ -38,8 +38,8 @@ public class FirefoxExtension
         private const string RdfManifestFileName = "install.rdf";
         private const string JsonManifestFileName = "manifest.json";
 
-        private string extensionFileName;
-        private string extensionResourceId;
+        private readonly string extensionFileName;
+        private readonly string extensionResourceId;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FirefoxExtension"/> class.
@@ -48,6 +48,7 @@ public class FirefoxExtension
         /// <remarks>WebDriver attempts to resolve the <paramref name="fileName"/> parameter
         /// by looking first for the specified file in the directory of the calling assembly,
         /// then using the full path to the file, if a full path is provided.</remarks>
+        /// <exception cref="ArgumentNullException">If <paramref name="fileName"/> is <see langword="null"/>.</exception>
         public FirefoxExtension(string fileName)
             : this(fileName, string.Empty)
         {
@@ -65,16 +66,18 @@ public FirefoxExtension(string fileName)
         /// not found in the file system, WebDriver attempts to locate a resource in the
         /// executing assembly with the name specified by the <paramref name="resourceId"/>
         /// parameter.</remarks>
+        /// <exception cref="ArgumentNullException">If <paramref name="fileName"/> or <paramref name="resourceId"/> are <see langword="null"/>.</exception>
         internal FirefoxExtension(string fileName, string resourceId)
         {
-            this.extensionFileName = fileName;
-            this.extensionResourceId = resourceId;
+            this.extensionFileName = fileName ?? throw new ArgumentNullException(nameof(fileName));
+            this.extensionResourceId = resourceId ?? throw new ArgumentNullException(nameof(resourceId));
         }
 
         /// <summary>
         /// Installs the extension into a profile directory.
         /// </summary>
         /// <param name="profileDirectory">The Firefox profile directory into which to install the extension.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="profileDirectory"/> is <see langword="null"/>.</exception>
         public void Install(string profileDirectory)
         {
             DirectoryInfo info = new DirectoryInfo(profileDirectory);
@@ -132,7 +135,7 @@ private static string GetExtensionId(string root)
 
         private static string ReadIdFromInstallRdf(string root)
         {
-            string id = null;
+            string id;
             string installRdf = Path.Combine(root, "install.rdf");
             try
             {
@@ -143,11 +146,11 @@ private static string ReadIdFromInstallRdf(string root)
                 rdfNamespaceManager.AddNamespace("em", EmNamespaceUri);
                 rdfNamespaceManager.AddNamespace("RDF", "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
 
-                XmlNode node = rdfXmlDocument.SelectSingleNode("//em:id", rdfNamespaceManager);
+                XmlNode? node = rdfXmlDocument.SelectSingleNode("//em:id", rdfNamespaceManager);
                 if (node == null)
                 {
-                    XmlNode descriptionNode = rdfXmlDocument.SelectSingleNode("//RDF:Description", rdfNamespaceManager);
-                    XmlAttribute attribute = descriptionNode.Attributes["id", EmNamespaceUri];
+                    XmlNode? descriptionNode = rdfXmlDocument.SelectSingleNode("//RDF:Description", rdfNamespaceManager);
+                    XmlAttribute? attribute = descriptionNode?.Attributes?["id", EmNamespaceUri];
                     if (attribute == null)
                     {
                         throw new WebDriverException("Cannot locate node containing extension id: " + installRdf);
@@ -175,26 +178,19 @@ private static string ReadIdFromInstallRdf(string root)
 
         private static string ReadIdFromManifestJson(string root)
         {
-            string id = null;
+            string id = string.Empty;
             string manifestJsonPath = Path.Combine(root, JsonManifestFileName);
+
             var manifestObject = JsonNode.Parse(File.ReadAllText(manifestJsonPath));
-            if (manifestObject["applications"] != null)
+            if (manifestObject!["applications"]?["gecko"]?["id"] is { } idNode)
             {
-                var applicationObject = manifestObject["applications"];
-                if (applicationObject["gecko"] != null)
-                {
-                    var geckoObject = applicationObject["gecko"];
-                    if (geckoObject["id"] != null)
-                    {
-                        id = geckoObject["id"].ToString().Trim();
-                    }
-                }
+                id = idNode.ToString().Trim();
             }
 
             if (string.IsNullOrEmpty(id))
             {
-                string addInName = manifestObject["name"].ToString().Replace(" ", "");
-                string addInVersion = manifestObject["version"].ToString();
+                string addInName = manifestObject["name"]!.ToString().Replace(" ", "");
+                string addInVersion = manifestObject["version"]!.ToString();
                 id = string.Format(CultureInfo.InvariantCulture, "{0}@{1}", addInName, addInVersion);
             }
 

dotnet/src/webdriver/Firefox/FirefoxProfile.cs

@@ -114,8 +114,14 @@ public static FirefoxProfile FromBase64String(string base64)
         /// Adds a Firefox Extension to this profile
         /// </summary>
         /// <param name="extensionToInstall">The path to the new extension</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="extensionToInstall"/> is <see langword="null"/>.</exception>
         public void AddExtension(string extensionToInstall)
         {
+            if (extensionToInstall is null)
+            {
+                throw new ArgumentNullException(nameof(extensionToInstall));
+            }
+
             this.extensions.Add(Path.GetFileNameWithoutExtension(extensionToInstall), new FirefoxExtension(extensionToInstall));
         }
 

dotnet/src/webdriver/ICookieJar.cs

@@ -61,7 +61,7 @@ public interface ICookieJar
         /// Deletes the cookie with the specified name from the page.
         /// </summary>
         /// <param name="name">The name of the cookie to be deleted.</param>
-        /// <exception cref="ArgumentNullException">If <paramref name="name"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="name"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>
         void DeleteCookieNamed(string name);
 
         /// <summary>

dotnet/test/common/CookieImplementationTest.cs

@@ -620,6 +620,28 @@ public void DeleteAllCookiesDifferentUrls()
             AssertCookieIsPresentWithName(cookie2.Name);
         }
 
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void ShouldThrowWhenGetInvalidCookieByName(string cookieName)
+        {
+            var getCookieAction = () => driver.Manage().Cookies.GetCookieNamed(cookieName);
+
+            Assert.That(getCookieAction, Throws.ArgumentException);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void ShouldThrowWhenDeleteInvalidCookieByName(string cookieName)
+        {
+            var deleteCookieAction = () => driver.Manage().Cookies.DeleteCookieNamed(cookieName);
+
+            Assert.That(deleteCookieAction, Throws.ArgumentException);
+        }
+
         //------------------------------------------------------------------
         // Tests below here are not included in the Java test suite
         //------------------------------------------------------------------

java/maven_install.json

@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 1132645732,
-  "__RESOLVED_ARTIFACTS_HASH": 1947623231,
+  "__INPUT_ARTIFACTS_HASH": 1220324005,
+  "__RESOLVED_ARTIFACTS_HASH": 1655871984,
   "artifacts": {
     "com.beust:jcommander": {
       "shasums": {
@@ -459,10 +459,10 @@
     },
     "net.bytebuddy:byte-buddy-agent": {
       "shasums": {
-        "jar": "1d76defd159a564b9cb7a968d0dea27367b8b70ebde75a968e7ef1921bc75ee4",
-        "sources": "8a7e537a5c2a932a6d73dcec9aa8d5388d33ab3aa91ea410aeea5228dcfe9745"
+        "jar": "316d2c0795c2a4d4c4756f2e6f9349837c7430ac34e0477ead874d05f5cc19e5",
+        "sources": "a73d2869afd79b63396a0a07ac037bbfa184eb7306916343c030feb5335ac940"
       },
-      "version": "1.15.4"
+      "version": "1.15.11"
     },
     "net.sf.saxon:Saxon-HE": {
       "shasums": {
@@ -676,10 +676,10 @@
     },
     "org.mockito:mockito-core": {
       "shasums": {
-        "jar": "2296141c1e1f2e1ae35c08d36a9ab4563ecd66e03533fe82630a764e7aa49182",
-        "sources": "32f318184ab3795885743f23d8be0da7fe856e3e360b518083f8b366a44d2b33"
+        "jar": "bf48b7372d9491d5ec8aebb4cdd187d15663931599c0fbe7410166ce0e1e58ff",
+        "sources": "bc0ee4bc1d8d43a9bd5e5b49dc479566c28db0740284524140aa264e57e8e27e"
       },
-      "version": "5.14.2"
+      "version": "5.15.2"
     },
     "org.objenesis:objenesis": {
       "shasums": {