Revert - every test needs testID granted + clean test id in the disposal method.

Author: ilonatommy

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

@@ -31,10 +31,56 @@ public void Navigate(string relativeUrl)
         Browser.Navigate(_serverFixture.RootUri, relativeUrl);
     }
 
-    protected override void InitializeAsyncCore()
+    public override async Task DisposeAsync()
     {
+        CleanupTestId();
+
+        await base.DisposeAsync();
+    }
+
+    protected override void InitializeAsyncCore(bool supportEnhancedNavigationSuppression = false)
+    {
+        if (supportEnhancedNavigationSuppression)
+        {
+            GrantTestId();
+        }
+
         // Clear logs - we check these during tests in some cases.
         // Make sure each test starts clean.
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
+
+        InitializeAsyncCore();
+    }
+
+    private void GrantTestId()
+    {
+        // We need to navigate here first otherwise the browser isn't on the correct origin to access sessionStorage
+        Navigate($"{ServerPathBase}/");
+        Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
+
+        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.", ex);
+        }
+
+        var testId = Guid.NewGuid().ToString("N")[..8];
+        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+    }
+
+    private void CleanupTestId()
+    {
+        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.", ex);
+        }
+        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
     }
 }

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

@@ -31,7 +31,7 @@ public EnhancedNavigationTest(
     // One of the tests here makes use of the streaming rendering page, which uses global state
     // so we can't run at the same time as other such tests
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext);
+        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
 
     [Fact]
     public void CanNavigateToAnotherPageWhilePreservingCommonDOMElements()
@@ -313,7 +313,7 @@ public void RefreshCanFallBackOnFullPageReload(string renderMode)
         Browser.Exists(By.TagName("nav")).FindElement(By.LinkText($"Interactive component navigation ({renderMode})")).Click();
         Browser.Equal("Page with interactive components that navigate", () => Browser.Exists(By.TagName("h1")).Text);
 
-        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, true, skipNavigation: true);
+        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, true);
         Browser.Navigate().Refresh();
         Browser.Equal("Page with interactive components that navigate", () => Browser.Exists(By.TagName("h1")).Text);
 

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

@@ -11,33 +11,24 @@ namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 
 public static class EnhancedNavigationTestUtil
 {
-    public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool shouldSuppress, bool skipNavigation = false)
+    public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool shouldSuppress)
         where TServerFixture : ServerFixture
     {
         if (shouldSuppress)
         {
             var browser = fixture.Browser;
-
-            if (!skipNavigation)
-            {
-                // Normally we need to navigate here first otherwise the browser isn't on the correct origin to access
-                // sessionStorage. But some tests are already in the right place and need to avoid extra navigation.
-                fixture.Navigate($"{fixture.ServerPathBase}/");
-                browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
-            }
-
             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);
+                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page.", ex);
             }
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId == null)
             {
-                testId = GrantTestId(browser);
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled for test class by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync`.");
             }
 
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
@@ -47,12 +38,6 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
         }
     }
-    private static string GrantTestId(IWebDriver browser)
-    {
-        var testId = Guid.NewGuid().ToString("N")[..8];
-        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
-        return testId;
-    }
 
     public static long GetScrollY(this IWebDriver browser)
         => Convert.ToInt64(((IJavaScriptExecutor)browser).ExecuteScript("return window.scrollY"), CultureInfo.CurrentCulture);

src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs

@@ -32,7 +32,7 @@ public override Task InitializeAsync()
         _tempDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
         Directory.CreateDirectory(_tempDirectory);
 
-        return InitializeAsync(BrowserFixture.StreamingContext);
+        return InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
     }
 
     [Theory]

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

@@ -285,7 +285,7 @@ public void NotFoundSetOnInitialization_ResponseStarted_SSR(bool hasReExecutionM
     [InlineData(false, true)]
     public void NotFoundSetOnInitialization_ResponseStarted_EnhancedNavigationDisabled_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
     {
-        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, true, skipNavigation: true);
+        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, true);
         string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
         string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
         Navigate(testUrl);

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

@@ -27,7 +27,7 @@ public StreamingRenderingTest(
     }
 
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext);
+        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
 
     [Fact]
     public async Task CanRenderNonstreamingPageWithoutInjectingStreamingMarkersOrHeaders()

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

@@ -29,7 +29,7 @@ public StatePersistenceTest(
 
     // Separate contexts to ensure that caches and other state don't interfere across tests.
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext + _nextStreamingIdContext++);
+        => InitializeAsync(BrowserFixture.StreamingContext + _nextStreamingIdContext++, supportEnhancedNavigationSuppression: true);
 
     // Validates that we can use persisted state across server, webassembly, and auto modes, with and without
     // streaming rendering.

src/Shared/E2ETesting/BrowserTestBase.cs

@@ -49,7 +49,7 @@ public IWebDriver Browser
 
     public BrowserFixture BrowserFixture { get; }
 
-    public Task DisposeAsync()
+    public virtual Task DisposeAsync()
     {
         return Task.CompletedTask;
     }
@@ -59,13 +59,18 @@ public virtual Task InitializeAsync()
         return InitializeAsync("");
     }
 
-    public virtual Task InitializeAsync(string isolationContext)
+    public virtual Task InitializeAsync(string isolationContext, bool supportEnhancedNavigationSuppression = false)
     {
         InitializeBrowser(isolationContext);
-        InitializeAsyncCore();
+        InitializeAsyncCore(supportEnhancedNavigationSuppression);
         return Task.CompletedTask;
     }
 
+    protected virtual void InitializeAsyncCore(bool supportEnhancedNavigationSuppression = false)
+    {
+        InitializeAsyncCore();
+    }
+
     protected virtual void InitializeAsyncCore()
     {
     }