Merge branch 'trunk' into dotnet-generator-modernize

RenderMichael · web-flow · commit c4ae14e0a5f0 · 2025-01-13T20:42:46.000-05:00
diff --git a/.github/workflows/ci-python.yml b/.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
diff --git a/.github/workflows/nightly.yml b/.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
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
@@ -107,10 +107,10 @@ jobs:
         run: |
           git config --local user.email "selenium-ci@users.noreply.github.com"
           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
diff --git a/MODULE.bazel b/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",
diff --git a/dotnet/src/webdriver/CookieJar.cs b/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
diff --git a/dotnet/src/webdriver/ICookieJar.cs b/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>
diff --git a/dotnet/test/common/CookieImplementationTest.cs b/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
         //------------------------------------------------------------------
diff --git a/java/maven_install.json b/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": {
diff --git a/javascript/grid-ui/package.json b/javascript/grid-ui/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@apollo/client": "3.12.4",
+    "@apollo/client": "3.12.5",
     "@emotion/react": "11.14.0",
     "@emotion/styled": "11.14.0",
     "@mui/icons-material": "5.15.18",
diff --git a/javascript/node/selenium-webdriver/README.md b/javascript/node/selenium-webdriver/README.md
@@ -91,7 +91,7 @@ To use the Selenium Server, you will need to install the
 download the latest server from [Selenium][release]. Once downloaded, run the
 server with
 
-    java -jar selenium-server-4.4.0.jar standalone
+    java -jar selenium-server-4.27.0.jar standalone
 
 You may configure your tests to run against a remote server through the Builder
 API:
@@ -135,18 +135,17 @@ will also have "best effort" support. Releases older than the latest LTS,
 _semver-major_ releases, and all unstable release branches (e.g. "v.Next")
 are considered strictly unsupported.
 
-For example, suppose the current LTS and stable releases are v14.20.0 and
-v18.8.0,
+For example, suppose the current LTS and stable releases are v22.13.0 and
+v23.6.0,
 respectively. Then a Selenium release would have the following support levels:
 
-|  Version  |    Support    |
-| :-------: | :-----------: |
-| <= 14.19  | _unsupported_ |
-|  14.20.0  |   supported   |
-|  18.0-7   |  best effort  |
-|  18.8.0   |   supported   |
-| >= 18.8.0 |  best effort  |
-|  v.Next   | _unsupported_ |
+|  Version   |    Support    |
+| :--------: | :-----------: |
+| <= 16.20.2 | _unsupported_ |
+|  16.20.2   |   supported   |
+|   18.8.0   |   supported   |
+| >= 22.13.0 |  best effort  |
+|   v.Next   | _unsupported_ |
 
 ### Support Level Definitions
 
@@ -168,11 +167,12 @@ months, the support window for selenium-webdriver will be roughly:
 
 | Release |     Status      | END-OF-LIFE |
 | :-----: | :-------------: | :---------: |
-|  v14.x  | Maintenance LTS | 2023-04-30  |
-|  v16.x  |   Active LTS    | 2023-09-11  |
-|  v18.x  |     Current     | 2025-04-30  |
-|  v19.x  |     Pending     | 2023-06-01  |
-|   v20   |     Pending     | 2026-04-30  |
+|  v18.x  | Maintenance LTS | 2025-04-30  |
+|  v19.x  |   End-of-Life   | 2023-06-01  |
+|  v20.x  | Maintenance LTS | 2026-04-30  |
+|  v21.x  |   End-of-Life   | 2024-06-01  |
+|  V22.x  |   Active LTS    | 2027-04-30  |
+|  V23.x  |     Current     | 2025-06-01  |
 
 ## Issues
 
diff --git a/javascript/node/selenium-webdriver/lib/webdriver.js b/javascript/node/selenium-webdriver/lib/webdriver.js
@@ -1937,6 +1937,11 @@ class Options {
    *     when the cookie has been deleted.
    */
   deleteCookie(name) {
+    // Validate the cookie name is non-empty and properly trimmed.
+    if (!name?.trim()) {
+      throw new error.InvalidArgumentError('Cookie name cannot be empty')
+    }
+
     return this.driver_.execute(new command.Command(command.Name.DELETE_COOKIE).setParameter('name', name))
   }
 
@@ -1957,25 +1962,24 @@ class Options {
    * WebDriver wire protocol.
    *
    * @param {string} name The name of the cookie to retrieve.
+   * @throws {InvalidArgumentError} - If the cookie name is empty or invalid.
    * @return {!Promise<?Options.Cookie>} A promise that will be resolved
    *     with the named cookie
    * @throws {error.NoSuchCookieError} if there is no such cookie.
    */
   async getCookie(name) {
+    // Validate the cookie name is non-empty and properly trimmed.
+    if (!name?.trim()) {
+      throw new error.InvalidArgumentError('Cookie name cannot be empty')
+    }
+
     try {
       const cookie = await this.driver_.execute(new command.Command(command.Name.GET_COOKIE).setParameter('name', name))
       return cookie
     } catch (err) {
       if (!(err instanceof error.UnknownCommandError) && !(err instanceof error.UnsupportedOperationError)) {
         throw err
       }
-
-      const cookies = await this.getCookies()
-      for (let cookie of cookies) {
-        if (cookie && cookie['name'] === name) {
-          return cookie
-        }
-      }
       return null
     }
   }
diff --git a/javascript/node/selenium-webdriver/package.json b/javascript/node/selenium-webdriver/package.json
@@ -20,7 +20,7 @@
     "url": "https://github.com/SeleniumHQ/selenium.git"
   },
   "engines": {
-    "node": ">= 14.21.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@bazel/runfiles": "^6.3.1",
@@ -29,10 +29,10 @@
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.17.0",
+    "@eslint/js": "^9.18.0",
     "clean-jsdoc-theme": "^4.3.0",
-    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint": "^9.18.0",
+    "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-mocha": "^10.5.0",
     "eslint-plugin-n": "^17.15.1",
     "eslint-plugin-no-only-tests": "^3.3.0",
diff --git a/javascript/node/selenium-webdriver/safari.js b/javascript/node/selenium-webdriver/safari.js
@@ -78,6 +78,19 @@ class Options extends Capabilities {
     this.options_[TECHNOLOGY_PREVIEW_OPTIONS_KEY] = !!useTechnologyPreview
     return this
   }
+
+  /**
+   * Enables diagnostic logging for Safari.
+   *
+   * This method sets the `safari:diagnose` option to `true` in the current configuration.
+   * It is used to enable additional logging or diagnostic features specific to Safari.
+   *
+   * @returns {Options} Returns the current instance
+   */
+  enableLogging() {
+    this.set('safari:diagnose', true)
+    return this
+  }
 }
 
 /**
diff --git a/javascript/node/selenium-webdriver/test/cookie_test.js b/javascript/node/selenium-webdriver/test/cookie_test.js
@@ -54,6 +54,24 @@ suite(function (env) {
         })
     })
 
+    it('Get Cookie: throw error if name is null', async function () {
+      const cookie = createCookieSpec()
+      await driver.manage().addCookie(cookie)
+      await assert.rejects(async () => await driver.manage().getCookie(null), {
+        name: 'InvalidArgumentError',
+        message: `Cookie name cannot be empty`,
+      })
+    })
+
+    it('Delete cookie: throw error if name is null', async function () {
+      const cookie = createCookieSpec()
+      await driver.manage().addCookie(cookie)
+      await assert.rejects(async () => await driver.manage().deleteCookie(null), {
+        name: 'InvalidArgumentError',
+        message: `Cookie name cannot be empty`,
+      })
+    })
+
     it('can get all cookies', async function () {
       const cookie1 = createCookieSpec()
       const cookie2 = createCookieSpec()
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "selenium",
-  "packageManager": "pnpm@9.15.2",
+  "packageManager": "pnpm@9.15.4",
   "workspaces": [
     "javascript/grid-ui",
     "javascript/node/selenium-webdriver"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/py/BUILD.bazel b/py/BUILD.bazel
diff --git a/py/docs/source/index.rst b/py/docs/source/index.rst
diff --git a/py/pyproject.toml b/py/pyproject.toml
diff --git a/py/requirements_lock.txt b/py/requirements_lock.txt
diff --git a/py/tox.ini b/py/tox.ini
diff --git a/rust/src/firefox.rs b/rust/src/firefox.rs

Original file line number	Diff line number	Diff line change
`@@ -74,16 +74,16 @@ public void AddCookie(Cookie cookie)`
`74`	`74`	`/// Delete the cookie by passing in the name of the cookie`
`75`	`75`	`/// </summary>`
`76`	`76`	`/// <param name="name">The name of the cookie that is in the browser</param>`
`77`		`- /// <exception cref="ArgumentNullException">If <paramref name="name"/> is <see langword="null"/>.</exception>`
	`77`	`+ /// <exception cref="ArgumentException">If <paramref name="name"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>`
`78`	`78`	`public void DeleteCookieNamed(string name)`
`79`	`79`	`{`
`80`		`- if (name is null)`
	`80`	`+ if (string.IsNullOrWhiteSpace(name))`
`81`	`81`	`{`
`82`		`- throw new ArgumentNullException(nameof(name));`
	`82`	`+ throw new ArgumentException("Cookie name cannot be null or empty", nameof(name));`
`83`	`83`	`}`
`84`	`84`
`85`		`- Dictionary<string, object> parameters = new Dictionary<string, object>();`
`86`		`- parameters.Add("name", name);`
	`85`	`+ Dictionary<string, object> parameters = new() { { "name", name } };`
	`86`	`+`
`87`	`87`	`driver.InternalExecute(DriverCommand.DeleteCookie, parameters);`
`88`	`88`	`}`
`89`	`89`
`@@ -115,11 +115,12 @@ public void DeleteAllCookies()`
`115`	`115`	`/// </summary>`
`116`	`116`	`/// <param name="name">name of the cookie that needs to be returned</param>`
`117`	`117`	`/// <returns>A Cookie from the name; or <see langword="null"/> if not found.</returns>`
	`118`	`+ /// <exception cref="ArgumentException">If <paramref name="name"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>`
`118`	`119`	`public Cookie? GetCookieNamed(string name)`
`119`	`120`	`{`
`120`	`121`	`if (string.IsNullOrWhiteSpace(name))`
`121`	`122`	`{`
`122`		`- throw new ArgumentException("Cookie name cannot be empty", nameof(name));`
	`123`	`+ throw new ArgumentException("Cookie name cannot be null or empty", nameof(name));`
`123`	`124`	`}`
`124`	`125`
`125`	`126`	`try`