Fix selenium-standalone invocation (#41592)

* Fix selenium-standalone invocation * Revert "[Blazor] Updates selenium dependencies (#41557)" This reverts commit 21257b0.
dotnet · May 9, 2022 · 10a1346 · 10a1346
1 parent 19964bf
commit 10a1346
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 115 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -268,9 +268,9 @@
     <MicrosoftPlaywrightVersion>1.17.3</MicrosoftPlaywrightVersion>
     <PollyExtensionsHttpVersion>3.0.0</PollyExtensionsHttpVersion>
     <PollyVersion>7.2.3</PollyVersion>
-    <SeleniumSupportVersion>4.1.1</SeleniumSupportVersion>
-    <SeleniumWebDriverChromeDriverVersion>100.0.4896.6000</SeleniumWebDriverChromeDriverVersion>
-    <SeleniumWebDriverVersion>4.1.1</SeleniumWebDriverVersion>
+    <SeleniumSupportVersion>4.1.0</SeleniumSupportVersion>
+    <SeleniumWebDriverChromeDriverVersion>98.0.4758.10200</SeleniumWebDriverChromeDriverVersion>
+    <SeleniumWebDriverVersion>4.1.0</SeleniumWebDriverVersion>
     <SerilogExtensionsLoggingVersion>1.4.0</SerilogExtensionsLoggingVersion>
     <SerilogSinksFileVersion>4.0.0</SerilogSinksFileVersion>
     <StackExchangeRedisVersion>2.2.4</StackExchangeRedisVersion>

diff --git a/src/Components/ComponentsNoDeps.slnf b/src/Components/ComponentsNoDeps.slnf
@@ -47,12 +47,10 @@
       "src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj",
       "src\\Components\\test\\E2ETest\\Microsoft.AspNetCore.Components.E2ETests.csproj",
       "src\\Components\\test\\testassets\\BasicTestApp\\BasicTestApp.csproj",
-      "src\\Components\\test\\testassets\\ComponentsApp.App\\ComponentsApp.App.csproj",
       "src\\Components\\test\\testassets\\ComponentsApp.Server\\ComponentsApp.Server.csproj",
       "src\\Components\\test\\testassets\\GlobalizationWasmApp\\GlobalizationWasmApp.csproj",
-      "src\\Components\\test\\testassets\\LazyTestContentPackage\\LazyTestContentPackage.csproj",
       "src\\Components\\test\\testassets\\TestContentPackage\\TestContentPackage.csproj",
       "src\\Components\\test\\testassets\\TestServer\\Components.TestServer.csproj"
     ]
   }
-}
+}
diff --git a/src/Components/test/E2ETest/package.json b/src/Components/test/E2ETest/package.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "dependencies": {
     "sauce-connect-launcher": "^1.3.1",
-    "selenium-standalone": "^8.1.2"
+    "selenium-standalone": "^7.1.0"
   },
   "devDependencies": {
     "@types/node": "^13.1.7",

diff --git a/src/Components/test/E2ETest/yarn.lock b/src/Components/test/E2ETest/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;^8.1.2&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", "localhost", port).Uri;
+        var uri = new UriBuilder("http", "localhost", port, "/wd/hub").Uri;
 
         var seleniumConfigPath = typeof(SeleniumStandaloneServer).Assembly
             .GetCustomAttributes<AssemblyMetadataAttribute>()
@@ -111,7 +111,7 @@ private static async Task InitializeInstance(ITestOutputHelper output)
         var psi = new ProcessStartInfo
         {
             FileName = "npm",
-            Arguments = $"run selenium-standalone start -- --config \"{seleniumConfigPath}\" {chromeDriverArg} -- --host localhost --port {port}",
+            Arguments = $"run selenium-standalone start -- --config \"{seleniumConfigPath}\" {chromeDriverArg} -- -port {port}",
             RedirectStandardOutput = true,
             RedirectStandardError = true,
         };
@@ -178,13 +178,7 @@ private static async Task InitializeInstance(ITestOutputHelper output)
         // Log
         void LogOutput(object sender, DataReceivedEventArgs e)
         {
-            try
-            {
-                logOutput.TryAdd(e.Data);
-            }
-            catch (Exception)
-            {
-            }
+            logOutput.TryAdd(e.Data);
 
             // We avoid logging on the output here because it is unreliable. We can only log in the diagnostics sink.
             lock (_diagnosticsMessageSink)

diff --git a/src/Shared/E2ETesting/WaitAssert.cs b/src/Shared/E2ETesting/WaitAssert.cs
@@ -116,7 +116,7 @@ private static TResult WaitAssertCore<TResult>(IWebDriver driver, Func<TResult>
             // tests running concurrently might use the DefaultTimeout in their current assertion, which is fine.
             TestRunFailed = true;
 
-            var innerHtml = driver.FindElement(By.CssSelector(":first-child"))?.GetAttribute("innerHTML");
+            var innerHtml = driver.FindElement(By.CssSelector(":first-child")).GetAttribute("innerHTML");
 
             var fileId = $"{Guid.NewGuid():N}.png";
             var screenShotPath = Path.Combine(Path.GetFullPath(E2ETestOptions.Instance.ScreenShotsPath), fileId);

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