Merge branch 'trunk' into 13803-implementation-fix

Author: VietND96

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/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
         //------------------------------------------------------------------

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",

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))
   }
 

javascript/node/selenium-webdriver/package.json

@@ -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",

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
+  }
 }
 
 /**

javascript/node/selenium-webdriver/test/cookie_test.js

@@ -54,7 +54,7 @@ suite(function (env) {
         })
     })
 
-    it('throw error if name is null', async function () {
+    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), {
@@ -63,6 +63,15 @@ suite(function (env) {
       })
     })
 
+    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()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "selenium",
-  "packageManager": "[email protected].2",
+  "packageManager": "[email protected].4",
   "workspaces": [
     "javascript/grid-ui",
     "javascript/node/selenium-webdriver"