Merge branch 'trunk' into renovate/selenium-devtools-0.x

diemol · web-flow · commit 3073d0594549 · 2024-04-25T13:47:39.000+02:00
diff --git a/.github/workflows/java-examples.yml b/.github/workflows/java-examples.yml
@@ -58,12 +58,30 @@ jobs:
         command: |
           cd examples/java
           mvn -B test
-    - name: Run Tests Nightly
-      if: matrix.release == 'nightly'
+    - name: Run Tests Nightly Linux/macOS
+      if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
       uses: nick-invision/retry@v3.0.0
       with:
         timeout_minutes: 20
         max_attempts: 3
         command: |
+          pip install yq
+          xml_content=$(curl -sf https://oss.sonatype.org/service/local/repositories/snapshots/content/org/seleniumhq/selenium/selenium-java/)
+          latest_snapshot=$(echo $xml_content | xq '.content.data."content-item"' | jq -r 'sort_by(.lastModified) | reverse | .[0] | .text')
+          echo $latest_snapshot
           cd examples/java
-          mvn -B -U test -Dselenium.version=4.20.0-SNAPSHOT
+          mvn -B -U test -Dselenium.version="$latest_snapshot"
+
+    - name: Run Tests Nightly Windows
+      if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
+      uses: nick-invision/retry@v3.0.0
+      with:
+        timeout_minutes: 20
+        max_attempts: 3
+        command: |
+          pip install yq          
+          $xml_content = Invoke-WebRequest -Uri "https://oss.sonatype.org/service/local/repositories/snapshots/content/org/seleniumhq/selenium/selenium-java/"
+          $latest_snapshot = $xml_content.Content | xq '.content.data.\"content-item\"' | jq -r 'sort_by(.lastModified) | reverse | .[0] | .text'
+          Write-Output $latest_snapshot
+          cd examples/java
+          mvn -B -U test "-Dselenium.version=$latest_snapshot"
diff --git a/examples/dotnet/SeleniumDocs/Bidirectional/ChromeDevtools/CdpApiTest.cs b/examples/dotnet/SeleniumDocs/Bidirectional/ChromeDevtools/CdpApiTest.cs
@@ -5,8 +5,8 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.DevTools;
-using OpenQA.Selenium.DevTools.V121.Network;
-using OpenQA.Selenium.DevTools.V121.Performance;
+using OpenQA.Selenium.DevTools.V124.Network;
+using OpenQA.Selenium.DevTools.V124.Performance;
 
 namespace SeleniumDocs.Bidirectional.ChromeDevtools
 {
@@ -16,15 +16,15 @@ public class CdpApiTest : BaseTest
         [TestInitialize]
         public void Startup()
         {
-            StartDriver("121");
+            StartDriver("124");
         }
 
         [TestMethod]
         public async Task SetCookie()
         {
             var session = ((IDevTools)driver).GetDevToolsSession();
-            var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V121.DevToolsSessionDomains>();
-            await domains.Network.Enable(new OpenQA.Selenium.DevTools.V121.Network.EnableCommandSettings());
+            var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V124.DevToolsSessionDomains>();
+            await domains.Network.Enable(new OpenQA.Selenium.DevTools.V124.Network.EnableCommandSettings());
 
             var cookieCommandSettings = new SetCookieCommandSettings
             {
@@ -47,8 +47,8 @@ public async Task PerformanceMetrics()
             driver.Url = "https://www.selenium.dev/selenium/web/frameset.html";
 
             var session = ((IDevTools)driver).GetDevToolsSession();
-            var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V121.DevToolsSessionDomains>();
-            await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V121.Performance.EnableCommandSettings());
+            var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V124.DevToolsSessionDomains>();
+            await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V124.Performance.EnableCommandSettings());
 
             var metricsResponse =
                 await session.SendCommand<GetMetricsCommandSettings, GetMetricsCommandResponse>(
@@ -68,8 +68,8 @@ await session.SendCommand<GetMetricsCommandSettings, GetMetricsCommandResponse>(
         public async Task BasicAuth()
         {
             var session = ((IDevTools)driver).GetDevToolsSession();
-            var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V121.DevToolsSessionDomains>();
-            await domains.Network.Enable(new OpenQA.Selenium.DevTools.V121.Network.EnableCommandSettings());
+            var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V124.DevToolsSessionDomains>();
+            await domains.Network.Enable(new OpenQA.Selenium.DevTools.V124.Network.EnableCommandSettings());
 
             var encodedAuth = Convert.ToBase64String(Encoding.Default.GetBytes("admin:admin"));
             var headerSettings = new SetExtraHTTPHeadersCommandSettings
diff --git a/examples/dotnet/SeleniumDocs/Browsers/ChromeTest.cs b/examples/dotnet/SeleniumDocs/Browsers/ChromeTest.cs
@@ -177,7 +177,7 @@ private static string GetChromeLocation()
             {
                 BrowserVersion = "stable"
             };
-            return new DriverFinder(options).BrowserPath();
+            return new DriverFinder(options).GetBrowserPath();
         }
     }
 }
diff --git a/examples/dotnet/SeleniumDocs/Browsers/EdgeTest.cs b/examples/dotnet/SeleniumDocs/Browsers/EdgeTest.cs
@@ -177,7 +177,7 @@ private static string GetEdgeLocation()
             {
                 BrowserVersion = "stable"
             };
-            return new DriverFinder(options).BrowserPath();
+            return new DriverFinder(options).GetBrowserPath();
         }
     }
 }
diff --git a/examples/dotnet/SeleniumDocs/Browsers/FirefoxTest.cs b/examples/dotnet/SeleniumDocs/Browsers/FirefoxTest.cs
@@ -201,7 +201,7 @@ private static string GetFirefoxLocation()
             {
                 BrowserVersion = "stable"
             };
-            return new DriverFinder(options).BrowserPath();
+            return new DriverFinder(options).GetBrowserPath();
         }
     }
 }
diff --git a/examples/dotnet/SeleniumDocs/Drivers/ServiceTest.cs b/examples/dotnet/SeleniumDocs/Drivers/ServiceTest.cs
@@ -38,7 +38,7 @@ public void DriverPort()
         
         private static string GetDriverLocation(ChromeOptions options)
         {
-            return new DriverFinder(options).DriverPath();
+            return new DriverFinder(options).GetDriverPath();
         }
 
         private static ChromeOptions GetLatestChromeOptions()
diff --git a/examples/dotnet/SeleniumDocs/SeleniumDocs.csproj b/examples/dotnet/SeleniumDocs/SeleniumDocs.csproj
@@ -10,8 +10,8 @@
       <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.5.1" />
       <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
       <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
-      <PackageReference Include="Selenium.Support" Version="4.19.0" />
-      <PackageReference Include="Selenium.WebDriver" Version="4.19.0" />
+      <PackageReference Include="Selenium.Support" Version="4.20.0" />
+      <PackageReference Include="Selenium.WebDriver" Version="4.20.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/examples/java/build.gradle b/examples/java/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.seleniumhq.selenium:selenium-java:4.19.1'
+    testImplementation 'org.seleniumhq.selenium:selenium-java:4.20.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
@@ -13,7 +13,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <selenium.version>4.19.1</selenium.version>
+        <selenium.version>4.20.0</selenium.version>
     </properties>
 
     <repositories>
diff --git a/examples/java/src/test/java/dev/selenium/bidirectional/chrome_devtools/CdpApiTest.java b/examples/java/src/test/java/dev/selenium/bidirectional/chrome_devtools/CdpApiTest.java
@@ -23,12 +23,12 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.devtools.DevTools;
 import org.openqa.selenium.devtools.HasDevTools;
-import org.openqa.selenium.devtools.v121.browser.Browser;
-import org.openqa.selenium.devtools.v121.network.Network;
-import org.openqa.selenium.devtools.v121.network.model.Headers;
-import org.openqa.selenium.devtools.v121.performance.Performance;
-import org.openqa.selenium.devtools.v121.performance.model.Metric;
-import org.openqa.selenium.devtools.v121.runtime.Runtime;
+import org.openqa.selenium.devtools.v124.browser.Browser;
+import org.openqa.selenium.devtools.v124.network.Network;
+import org.openqa.selenium.devtools.v124.network.model.Headers;
+import org.openqa.selenium.devtools.v124.performance.Performance;
+import org.openqa.selenium.devtools.v124.performance.model.Metric;
+import org.openqa.selenium.devtools.v124.runtime.Runtime;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
 public class CdpApiTest extends BaseTest {
@@ -37,7 +37,7 @@ public class CdpApiTest extends BaseTest {
   @BeforeEach
   public void createSession() {
     ChromeOptions options = new ChromeOptions();
-    options.setBrowserVersion("121");
+    options.setBrowserVersion("124");
     driver = new ChromeDriver(options);
     wait = new WebDriverWait(driver, Duration.ofSeconds(10));
   }
diff --git a/examples/java/src/test/java/dev/selenium/browsers/ChromeTest.java b/examples/java/src/test/java/dev/selenium/browsers/ChromeTest.java
@@ -22,7 +22,6 @@
 import org.openqa.selenium.logging.LogEntries;
 import org.openqa.selenium.logging.LogType;
 import org.openqa.selenium.logging.LoggingPreferences;
-import org.openqa.selenium.manager.SeleniumManagerOutput;
 import org.openqa.selenium.remote.service.DriverFinder;
 
 public class ChromeTest extends BaseTest {
@@ -177,8 +176,7 @@ public void disableBuildChecks() throws IOException {
   private File getChromeLocation() {
     ChromeOptions options = new ChromeOptions();
     options.setBrowserVersion("stable");
-    SeleniumManagerOutput.Result output =
-        DriverFinder.getPath(ChromeDriverService.createDefaultService(), options);
-    return new File(output.getBrowserPath());
+    DriverFinder finder = new DriverFinder(ChromeDriverService.createDefaultService(), options);
+    return new File(finder.getBrowserPath());
   }
 }
diff --git a/examples/java/src/test/java/dev/selenium/browsers/EdgeTest.java b/examples/java/src/test/java/dev/selenium/browsers/EdgeTest.java
@@ -22,7 +22,6 @@
 import org.openqa.selenium.logging.LogEntries;
 import org.openqa.selenium.logging.LogType;
 import org.openqa.selenium.logging.LoggingPreferences;
-import org.openqa.selenium.manager.SeleniumManagerOutput;
 import org.openqa.selenium.remote.service.DriverFinder;
 
 public class EdgeTest extends BaseTest {
@@ -171,8 +170,7 @@ public void disableBuildChecks() throws IOException {
   private File getEdgeLocation() {
     EdgeOptions options = new EdgeOptions();
     options.setBrowserVersion("stable");
-    SeleniumManagerOutput.Result output =
-        DriverFinder.getPath(EdgeDriverService.createDefaultService(), options);
-    return new File(output.getBrowserPath());
+    DriverFinder finder = new DriverFinder(EdgeDriverService.createDefaultService(), options);
+    return new File(finder.getBrowserPath());
   }
 }
diff --git a/examples/java/src/test/java/dev/selenium/browsers/FirefoxTest.java b/examples/java/src/test/java/dev/selenium/browsers/FirefoxTest.java
@@ -19,7 +19,6 @@
 import org.openqa.selenium.firefox.FirefoxDriverService;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.firefox.GeckoDriverService;
-import org.openqa.selenium.manager.SeleniumManagerOutput;
 import org.openqa.selenium.remote.service.DriverFinder;
 
 public class FirefoxTest extends BaseTest {
@@ -165,8 +164,7 @@ public void installUnsignedAddonPath() {
   private Path getFirefoxLocation() {
     FirefoxOptions options = new FirefoxOptions();
     options.setBrowserVersion("stable");
-    SeleniumManagerOutput.Result output =
-        DriverFinder.getPath(GeckoDriverService.createDefaultService(), options);
-    return Path.of(output.getBrowserPath());
+    DriverFinder finder = new DriverFinder(GeckoDriverService.createDefaultService(), options);
+    return Path.of(finder.getBrowserPath());
   }
 }
diff --git a/examples/java/src/test/java/dev/selenium/drivers/ServiceTest.java b/examples/java/src/test/java/dev/selenium/drivers/ServiceTest.java
@@ -6,7 +6,6 @@
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeDriverService;
 import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.manager.SeleniumManagerOutput;
 import org.openqa.selenium.remote.service.DriverFinder;
 
 public class ServiceTest extends BaseTest {
@@ -38,9 +37,8 @@ public void setPort() {
   private void setBinaryPaths() {
     ChromeOptions options = new ChromeOptions();
     options.setBrowserVersion("stable");
-    SeleniumManagerOutput.Result location =
-        DriverFinder.getPath(ChromeDriverService.createDefaultService(), options);
-    driverPath = new File(location.getDriverPath());
-    browserPath = new File(location.getBrowserPath());
+    DriverFinder finder = new DriverFinder(ChromeDriverService.createDefaultService(), options);
+    driverPath = new File(finder.getDriverPath());
+    browserPath = new File(finder.getBrowserPath());
   }
 }
diff --git a/examples/kotlin/pom.xml b/examples/kotlin/pom.xml
@@ -20,7 +20,7 @@
         <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
 
         <java.version>1.8</java.version>
-        <selenium.version>4.19.1</selenium.version>
+        <selenium.version>4.20.0</selenium.version>
 
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/examples/python/requirements.txt b/examples/python/requirements.txt
@@ -1,4 +1,4 @@
-selenium==4.19.0
+selenium==4.20.0
 pytest
 trio
 pytest-trio
diff --git a/examples/python/tests/bidirectional/chrome_devtools/test_cdp_api.py b/examples/python/tests/bidirectional/chrome_devtools/test_cdp_api.py
@@ -2,7 +2,7 @@
 
 import pytest
 from selenium.webdriver.common.by import By
-from selenium.webdriver.common.devtools.v121.network import Headers
+from selenium.webdriver.common.devtools.v124.network import Headers
 
 
 @pytest.mark.trio
diff --git a/examples/python/tests/conftest.py b/examples/python/tests/conftest.py
@@ -26,34 +26,31 @@ def chromedriver_bin():
     service = webdriver.chrome.service.Service()
     options = webdriver.ChromeOptions()
     options.browser_version = 'stable'
-    yield webdriver.common.driver_finder.DriverFinder().get_path(service=service, options=options)
+    yield webdriver.common.driver_finder.DriverFinder(service=service, options=options).get_driver_path()
 
 
 @pytest.fixture(scope='function')
 def chrome_bin():
     service = webdriver.chrome.service.Service()
     options = webdriver.ChromeOptions()
     options.browser_version = 'stable'
-    webdriver.common.driver_finder.DriverFinder().get_path(service=service, options=options)
-    yield options.binary_location
+    yield webdriver.common.driver_finder.DriverFinder(service=service, options=options).get_browser_path()
 
 
 @pytest.fixture(scope='function')
 def edge_bin():
     service = webdriver.edge.service.Service()
     options = webdriver.EdgeOptions()
     options.browser_version = 'stable'
-    webdriver.common.driver_finder.DriverFinder().get_path(service=service, options=options)
-    yield options.binary_location
+    yield webdriver.common.driver_finder.DriverFinder(service=service, options=options).get_browser_path()
 
 
 @pytest.fixture(scope='function')
 def firefox_bin():
     service = webdriver.firefox.service.Service()
     options = webdriver.FirefoxOptions()
     options.browser_version = 'stable'
-    webdriver.common.driver_finder.DriverFinder().get_path(service=service, options=options)
-    yield options.binary_location
+    yield webdriver.common.driver_finder.DriverFinder(service=service, options=options).get_browser_path()
 
 
 @pytest.fixture(scope='function')
diff --git a/website_and_docs/layouts/downloads/list.html b/website_and_docs/layouts/downloads/list.html
@@ -25,7 +25,7 @@
       <div class="card-body">
         <p class="card-text">
           Latest stable version
-          <a href="https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.19.0/selenium-server-4.19.1.jar">4.19.1</a>
+          <a href="https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.20.0/selenium-server-4.20.0.jar">4.20.0</a>
         </p>
         <p class="card-text">
           To use the Selenium Server in a Grid configuration see the
@@ -107,7 +107,7 @@ <h2 class="card-title">
     <div class="card-body">
       <h2 class="card-title">C# NuGet</h2>
       <p class="card-text w-lg-75">
-        Nuget latest release is 4.19.0 Released on March 27, 2024.
+        Nuget latest release is 4.20.0 Released on April 24, 2024.
       </p>
       <ul>
         <li>
diff --git a/website_and_docs/layouts/partials/selenium-clients-and-webdriver-bindings.html b/website_and_docs/layouts/partials/selenium-clients-and-webdriver-bindings.html
@@ -27,7 +27,7 @@ <h2 id="bindings" class="card-title">Selenium Clients and WebDriver Language Bin
         <p class="card-text m-0 pb-1">
           Stable:
           <a href="https://www.nuget.org/packages/Selenium.WebDriver" class="card-link">
-              4.19.0 (March 27, 2024)
+              4.20.0 (April 24, 2024)
           </a>
         </p>
         <p class="card-text m-0 pb-1">
@@ -54,8 +54,8 @@ <h2 id="bindings" class="card-title">Selenium Clients and WebDriver Language Bin
         </p>
         <p class="card-text m-0 pb-1">
           Stable:
-          <a href="https://rubygems.org/gems/selenium-webdriver/versions/4.19.0" class="card-link">
-            4.19.0 (March 27, 2024)
+          <a href="https://rubygems.org/gems/selenium-webdriver/versions/4.20.0" class="card-link">
+            4.20.0 (April 24, 2024)
           </a>
         </p>
         <p class="card-text m-0 pb-1">
@@ -82,8 +82,8 @@ <h2 id="bindings" class="card-title">Selenium Clients and WebDriver Language Bin
         </p>
         <p class="card-text m-0 pb-1">
           Stable:
-          <a href="https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.19.0/selenium-java-4.19.1.zip" class="card-link">
-            4.19.1 (March 29, 2024)
+          <a href="https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.20.0/selenium-java-4.20.0.zip" class="card-link">
+            4.20.0 (April 24, 2024)
           </a>
         </p>
         <p class="card-text m-0 pb-1">
@@ -111,7 +111,7 @@ <h2 id="bindings" class="card-title">Selenium Clients and WebDriver Language Bin
         <p class="card-text m-0 pb-1">
           Stable:
           <a href="https://pypi.python.org/pypi/selenium" class="card-link">
-            4.19.0 (March 27, 2024)
+            4.20.0 (April 24, 2024)
           </a>
         </p>
         <p class="card-text m-0 pb-1">
@@ -139,7 +139,7 @@ <h2 id="bindings" class="card-title">Selenium Clients and WebDriver Language Bin
         <p class="card-text m-0 pb-1">
           Stable:
           <a href="https://npmjs.org/package/selenium-webdriver" class="card-link">
-            4.19.0 (March 27, 2024)
+            4.20.0 (April 24, 2024)
           </a>
         </p>
         <p class="card-text m-0 pb-1">

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ private static string GetChromeLocation()`
`177`	`177`	`{`
`178`	`178`	`BrowserVersion = "stable"`
`179`	`179`	`};`
`180`		`- return new DriverFinder(options).BrowserPath();`
	`180`	`+ return new DriverFinder(options).GetBrowserPath();`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ private static string GetFirefoxLocation()`
`201`	`201`	`{`
`202`	`202`	`BrowserVersion = "stable"`
`203`	`203`	`};`
`204`		`- return new DriverFinder(options).BrowserPath();`
	`204`	`+ return new DriverFinder(options).GetBrowserPath();`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void DriverPort()`
`38`	`38`
`39`	`39`	`private static string GetDriverLocation(ChromeOptions options)`
`40`	`40`	`{`
`41`		`- return new DriverFinder(options).DriverPath();`
	`41`	`+ return new DriverFinder(options).GetDriverPath();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`private static ChromeOptions GetLatestChromeOptions()`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ repositories {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
`13`		`- testImplementation 'org.seleniumhq.selenium:selenium-java:4.19.1'`
	`13`	`+ testImplementation 'org.seleniumhq.selenium:selenium-java:4.20.0'`
`14`	`14`	`testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.2'`
`15`	`15`	`}`
`16`	`16`