Merge branch 'trunk' into pinned-browser-updates

diemol · web-flow · commit 7c5cf1e8f38a · 2025-04-02T10:22:41.000+02:00
diff --git a/Rakefile b/Rakefile
@@ -544,10 +544,6 @@ namespace :node do
       File.open(file, 'w') { |f| f.puts text }
       @git.add(file)
     end
-
-    # Update package-lock.json
-    sh 'pnpm install --dir javascript/selenium-webdriver', verbose: true
-    @git.add('javascript/selenium-webdriver/package-lock.json')
   end
 end
 
diff --git a/common/src/web/bidi/logEntryAdded.html b/common/src/web/bidi/logEntryAdded.html
@@ -2,7 +2,7 @@
 
 <body>
 
-    <h1>Long entry added events</h1>
+    <h1>Log entry added events</h1>
 
     <button id="consoleLog" onclick="helloWorld()">Click me for console logs</button>
 
diff --git a/common/src/web/logEntryAdded.html b/common/src/web/logEntryAdded.html
@@ -2,7 +2,7 @@
 
 <body>
 
-<h1>Long entry added events</h1>
+<h1>Log entry added events</h1>
 
 <button id="consoleLog" onclick="helloWorld()">Click me for console logs</button>
 
diff --git a/dotnet/src/support/UI/PopupWindowFinder.cs b/dotnet/src/support/UI/PopupWindowFinder.cs
@@ -18,7 +18,6 @@
 // </copyright>
 
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
@@ -132,35 +131,13 @@ public string Invoke(Action popupMethod)
             ReadOnlyCollection<string> existingHandles = this.driver.WindowHandles;
             popupMethod();
             WebDriverWait wait = new WebDriverWait(SystemClock.Instance, this.driver, this.timeout, this.sleepInterval);
-            string popupHandle = wait.Until<string>((d) =>
+            string popupHandle = wait.Until(driver =>
             {
-                string? foundHandle = null;
-                List<string> differentHandles = GetDifference(existingHandles, this.driver.WindowHandles);
-                if (differentHandles.Count > 0)
-                {
-                    foundHandle = differentHandles[0];
-                }
-
-                return foundHandle;
+                ReadOnlyCollection<string> newHandles = driver.WindowHandles;
+                return newHandles.Except(existingHandles, StringComparer.Ordinal).FirstOrDefault();
             });
 
             return popupHandle;
         }
-
-        private static List<string> GetDifference(ReadOnlyCollection<string> existingHandles, ReadOnlyCollection<string> currentHandles)
-        {
-            // We are using LINQ to get the difference between the two lists.
-            // The non-LINQ version looks like the following:
-            // List<string> differentHandles = new List<string>();
-            // foreach (string handle in currentHandles)
-            // {
-            //    if (!existingHandles.Contains(handle))
-            //    {
-            //        currentHandles.Add(handle);
-            //    }
-            // }
-            // return differentHandles;
-            return currentHandles.Except(existingHandles).ToList();
-        }
     }
 }
diff --git a/java/test/org/openqa/selenium/WebNetworkTest.java b/java/test/org/openqa/selenium/WebNetworkTest.java
@@ -189,7 +189,7 @@ void canAddRequestHandler() {
 
     driver.get(page);
 
-    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");
+    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");
   }
 
   @Test
@@ -321,7 +321,7 @@ void canAddMultipleRequestHandlers() {
 
     driver.get(page);
 
-    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");
+    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");
   }
 
   @Test
@@ -341,7 +341,7 @@ void canAddMultipleRequestHandlersWithTheSameFilter() {
 
     driver.get(page);
 
-    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");
+    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");
   }
 
   @Test
@@ -409,11 +409,11 @@ void canRemoveRequestHandler() throws InterruptedException {
   @Ignore(Browser.CHROME)
   @Ignore(Browser.EDGE)
   void canRemoveRequestHandlerThatDoesNotExist() {
-    ((RemoteWebDriver) driver).network().removeAuthenticationHandler(5);
+    ((RemoteWebDriver) driver).network().removeRequestHandler(5);
     page = appServer.whereIs("/bidi/logEntryAdded.html");
     driver.get(page);
 
-    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");
+    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");
   }
 
   @Test
@@ -439,6 +439,6 @@ void canClearRequestHandlers() {
 
     driver.get(page);
 
-    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");
+    assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ void canAddRequestHandler() {`
`189`	`189`
`190`	`190`	`driver.get(page);`
`191`	`191`
`192`		`- assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");`
	`192`	`+ assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`@Test`
`@@ -321,7 +321,7 @@ void canAddMultipleRequestHandlers() {`
`321`	`321`
`322`	`322`	`driver.get(page);`
`323`	`323`
`324`		`- assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");`
	`324`	`+ assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`@Test`
`@@ -341,7 +341,7 @@ void canAddMultipleRequestHandlersWithTheSameFilter() {`
`341`	`341`
`342`	`342`	`driver.get(page);`
`343`	`343`
`344`		`- assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");`
	`344`	`+ assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`@Test`
`@@ -409,11 +409,11 @@ void canRemoveRequestHandler() throws InterruptedException {`
`409`	`409`	`@Ignore(Browser.CHROME)`
`410`	`410`	`@Ignore(Browser.EDGE)`
`411`	`411`	`void canRemoveRequestHandlerThatDoesNotExist() {`
`412`		`- ((RemoteWebDriver) driver).network().removeAuthenticationHandler(5);`
	`412`	`+ ((RemoteWebDriver) driver).network().removeRequestHandler(5);`
`413`	`413`	`page = appServer.whereIs("/bidi/logEntryAdded.html");`
`414`	`414`	`driver.get(page);`
`415`	`415`
`416`		`- assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");`
	`416`	`+ assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`@Test`
`@@ -439,6 +439,6 @@ void canClearRequestHandlers() {`
`439`	`439`
`440`	`440`	`driver.get(page);`
`441`	`441`
`442`		`- assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Long entry added events");`
	`442`	`+ assertThat(driver.findElement(By.tagName("h1")).getText()).isEqualTo("Log entry added events");`
`443`	`443`	`}`
`444`	`444`	`}`