Revert "Grant ID for each test on initialization. Change BinaryHttpClientTest inheritance to ServerTestBase, so that it calls ID granting method as well."

This reverts commit 7ac455c.

Author: ilonatommy

src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs

@@ -44,9 +44,4 @@ protected override void InitializeAsyncCore()
         // Make sure each test starts clean.
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
     }
-
-    protected override void GrantTestId()
-    {
-        EnhancedNavigationTestUtil.GrantTestId(this);
-    }
 }

src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs

@@ -22,12 +22,20 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             {
                 NavigateToOrigin(fixture);
             }
-            AssertSessionStorageAvailable(browser);
+
+            try
+            {
+                ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
+            }
 
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId is null || string.IsNullOrEmpty(testId as string))
             {
-                throw new InvalidOperationException("Test ID not found in sessionStorage. Make sure your test class grants it in InitializeAsync.");
+                testId = GrantTestId(browser);
             }
 
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
@@ -38,27 +46,6 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
         }
     }
 
-    public static void AssertSessionStorageAvailable(IWebDriver browser)
-    {
-        try
-        {
-            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
-        }
-        catch (Exception ex)
-        {
-            throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
-        }
-
-    }
-
-    public static void GrantTestId<TServerFixture>(ServerTestBase<TServerFixture> fixture)
-        where TServerFixture : ServerFixture
-    {
-        NavigateToOrigin(fixture);
-        AssertSessionStorageAvailable(fixture.Browser);
-        GrantTestIdCore(fixture.Browser);
-    }
-
     public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
@@ -107,7 +94,7 @@ private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixtu
         fixture.Browser.Equal("Hello", () => fixture.Browser.Exists(By.TagName("h1")).Text);
     }
 
-    private static string GrantTestIdCore(IWebDriver browser)
+    private static string GrantTestId(IWebDriver browser)
     {
         var testId = Guid.NewGuid().ToString("N")[..8];
         ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");

src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs

@@ -2,17 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using BasicTestApp.HttpClientTest;
-using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
-using Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using TestServer;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.Tests;
 
-public class BinaryHttpClientTest : ServerTestBase<AspNetSiteServerFixture>,
+public class BinaryHttpClientTest : BrowserTestBase,
     IClassFixture<BasicTestAppServerSiteFixture<CorsStartup>>,
     IClassFixture<BlazorWasmTestAppFixture<BasicTestApp.Program>>
 {
@@ -25,13 +23,11 @@ public class BinaryHttpClientTest : ServerTestBase<AspNetSiteServerFixture>,
 
     public BinaryHttpClientTest(
         BrowserFixture browserFixture,
-        AspNetSiteServerFixture serverFixture,
         BlazorWasmTestAppFixture<BasicTestApp.Program> devHostServerFixture,
         BasicTestAppServerSiteFixture<CorsStartup> apiServerFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, output)
     {
-        serverFixture.BuildWebHostMethod = Program.BuildWebHost<CorsStartup>;
         _devHostServerFixture = devHostServerFixture;
         _devHostServerFixture.PathBase = "/subdir";
         _apiServerFixture = apiServerFixture;

src/Shared/E2ETesting/BrowserTestBase.cs

@@ -62,7 +62,6 @@ public virtual Task InitializeAsync()
     public virtual Task InitializeAsync(string isolationContext)
     {
         InitializeBrowser(isolationContext);
-        GrantTestId();
         InitializeAsyncCore();
         return Task.CompletedTask;
     }
@@ -71,10 +70,6 @@ protected virtual void InitializeAsyncCore()
     {
     }
 
-    protected virtual void GrantTestId()
-    {
-    }
-
     protected void InitializeBrowser(string isolationContext)
     {
         try