Revert "Revert "Revert "[Blazor] Update selenium versions (#50511)" (#…

…50556)"" This reverts commit c4586de.
dotnet · Sep 18, 2023 · 8a0eac7 · 8a0eac7
1 parent 707ac24
commit 8a0eac7
Show file tree

Hide file tree

Showing 8 changed files with 183 additions and 638 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -311,9 +311,9 @@
     <MicrosoftPlaywrightVersion>1.28.0</MicrosoftPlaywrightVersion>
     <PollyExtensionsHttpVersion>3.0.0</PollyExtensionsHttpVersion>
     <PollyVersion>7.2.4</PollyVersion>
-    <SeleniumSupportVersion>4.12.4</SeleniumSupportVersion>
-    <SeleniumWebDriverChromeDriverVersion>117.0.5938.6200</SeleniumWebDriverChromeDriverVersion>
-    <SeleniumWebDriverVersion>4.12.4</SeleniumWebDriverVersion>
+    <SeleniumSupportVersion>4.10.0</SeleniumSupportVersion>
+    <SeleniumWebDriverChromeDriverVersion>114.0.5735.9000</SeleniumWebDriverChromeDriverVersion>
+    <SeleniumWebDriverVersion>4.10.0</SeleniumWebDriverVersion>
     <SerilogExtensionsLoggingVersion>1.4.0</SerilogExtensionsLoggingVersion>
     <SerilogSinksFileVersion>4.0.0</SerilogSinksFileVersion>
     <StackExchangeRedisVersion>2.6.122</StackExchangeRedisVersion>

diff --git a/src/Components/test/E2ETest/package.json b/src/Components/test/E2ETest/package.json
@@ -11,9 +11,11 @@
   },
   "author": "",
   "license": "MIT",
-  "devDependencies": {
+  "dependencies": {
     "sauce-connect-launcher": "^1.3.1",
-    "selenium-standalone": "^9.1.1",
+    "selenium-standalone": "^7.1.0"
+  },
+  "devDependencies": {
     "@types/node": "^13.1.7",
     "ts-node": "^8.6.2",
     "typescript": "^3.7.5"

diff --git a/src/Components/test/E2ETest/yarn.lock b/src/Components/test/E2ETest/yarn.lock
diff --git a/src/ProjectTemplates/test/Templates.Tests/package.json b/src/ProjectTemplates/test/Templates.Tests/package.json
@@ -10,7 +10,7 @@
   },
   "author": "",
   "license": "MIT",
-  "devDependencies": {
-    "selenium-standalone": "^9.1.1"
+  "dependencies": {
+    "selenium-standalone": "^7.1.0"
   }
 }
diff --git a/src/ProjectTemplates/test/Templates.Tests/yarn.lock b/src/ProjectTemplates/test/Templates.Tests/yarn.lock
diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets
@@ -51,7 +51,7 @@
 
     <PropertyGroup>
       <_PackageJsonLinesContent>@(_PackageJsonLines)</_PackageJsonLinesContent>
-      <_PackageJsonSeleniumPackage>&quot;selenium-standalone&quot;: &quot;^9.1.1&quot;</_PackageJsonSeleniumPackage>
+      <_PackageJsonSeleniumPackage>&quot;selenium-standalone&quot;: &quot;^7.1.0&quot;</_PackageJsonSeleniumPackage>
     </PropertyGroup>
 
     <Error

diff --git a/src/Shared/E2ETesting/SeleniumStandaloneServer.cs b/src/Shared/E2ETesting/SeleniumStandaloneServer.cs
@@ -85,7 +85,7 @@ public static async Task<SeleniumStandaloneServer> GetInstanceAsync(ITestOutputH
     private static async Task InitializeInstance(ITestOutputHelper output)
     {
         var port = FindAvailablePort();
-        var uri = new UriBuilder("http", SeleniumHost, port).Uri;
+        var uri = new UriBuilder("http", SeleniumHost, port, "/wd/hub").Uri;
 
         var seleniumConfigPath = typeof(SeleniumStandaloneServer).Assembly
             .GetCustomAttributes<AssemblyMetadataAttribute>()
@@ -100,25 +100,22 @@ private static async Task InitializeInstance(ITestOutputHelper output)
         // In AzDO, the path to the system chromedriver is in an env var called CHROMEWEBDRIVER
         // We want to use this because it should match the installed browser version
         // If the env var is not set, then we fall back on using whatever is in the Selenium config file
+        var chromeDriverArg = string.Empty;
         var chromeDriverPathEnvVar = Environment.GetEnvironmentVariable("CHROMEWEBDRIVER");
         if (!string.IsNullOrEmpty(chromeDriverPathEnvVar))
         {
+            chromeDriverArg = $"--javaArgs=-Dwebdriver.chrome.driver={chromeDriverPathEnvVar}/chromedriver";
             output.WriteLine($"Using chromedriver at path {chromeDriverPathEnvVar}");
         }
 
         var psi = new ProcessStartInfo
         {
             FileName = "npm",
-            Arguments = $"run selenium-standalone start -- --config \"{seleniumConfigPath}\" -- --host {SeleniumHost} --port {port}",
+            Arguments = $"run selenium-standalone start -- --config \"{seleniumConfigPath}\" {chromeDriverArg} -- -host {SeleniumHost} -port {port}",
             RedirectStandardOutput = true,
             RedirectStandardError = true,
         };
 
-        if (!string.IsNullOrEmpty(chromeDriverPathEnvVar))
-        {
-            psi.EnvironmentVariables["PATH"] = $"{psi.EnvironmentVariables["PATH"]}{Path.PathSeparator}{chromeDriverPathEnvVar}";
-        }
-
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
             psi.FileName = "cmd";

diff --git a/src/Shared/E2ETesting/selenium-config.json b/src/Shared/E2ETesting/selenium-config.json
@@ -1,8 +1,7 @@
 {
-  "version": "4.12.0",
   "drivers": {
     "chrome": {
-      "version" : "117.0.5938.62"
+      "version" : "114.0.5735.90"
     }
   },
   "ignoreExtraDrivers": true