Cleanup - removal of storage items can be done once, on disposal.

Author: ilonatommy

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

@@ -34,8 +34,7 @@ public void Navigate(string relativeUrl)
 
     public override async Task DisposeAsync()
     {
-        TryCleanSessionStorage();
-
+        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
         await base.DisposeAsync();
     }
 
@@ -45,17 +44,4 @@ protected override void InitializeAsyncCore()
         // Make sure each test starts clean.
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
     }
-
-    private void TryCleanSessionStorage()
-    {
-        try
-        {
-            EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
-        }
-        catch (Exception ex)
-        {
-            // exception here most probably means session storage is not available - no cleanup needed
-            Output?.WriteLine("Error when removing test id from session storage: " + ex.Message);
-        }
-    }
 }

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

@@ -318,7 +318,7 @@ public void RefreshCanFallBackOnFullPageReload(string renderMode)
         Browser.Equal("Page with interactive components that navigate", () => Browser.Exists(By.TagName("h1")).Text);
 
         // if we don't clean up the suppression, all subsequent navigations will be suppressed by default
-        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
+        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this, skipNavigation: true);
 
         // Normally, you shouldn't store references to elements because they could become stale references
         // after the page re-renders. However, we want to explicitly test that the element becomes stale

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

@@ -14,29 +14,24 @@ public static class EnhancedNavigationTestUtil
     public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool shouldSuppress, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
-        var browser = fixture.Browser;
-
-        if (!skipNavigation)
+        if (shouldSuppress)
         {
-            // Navigate here first to ensure the browser is on the correct origin to access sessionStorage
-            fixture.Navigate($"{fixture.ServerPathBase}/");
-            browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
-        }
+            var browser = fixture.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);
-        }
+            if (!skipNavigation)
+            {
+                NavigateToOrigin(fixture);
+            }
 
-        // This prevents test interference where suppression state from previous tests persists
-        CleanEnhancedNavigationSuppression(fixture);
+            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);
+            }
 
-        if (shouldSuppress)
-        {
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId is null || string.IsNullOrEmpty(testId as string))
             {
@@ -51,12 +46,26 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
         }
     }
 
-    public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture)
+    public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
         var browser = fixture.Browser;
 
-        // only tests that suppress enhanced navigation will have these items set, so it can throw
+        // First, ensure we're on the correct origin to access sessionStorage
+        try
+        {
+            // Check if we can access sessionStorage from current location
+            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+        }
+        catch
+        {
+            if (skipNavigation)
+            {
+                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.");
+            }
+            NavigateToOrigin(fixture);
+        }
+
         var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
         if (testId is null || string.IsNullOrEmpty(testId as string))
         {
@@ -67,6 +76,14 @@ public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTest
         ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
     }
 
+    private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixture> fixture)
+        where TServerFixture : ServerFixture
+    {
+        // Navigate to the test origin to ensure the browser is on the correct state to access sessionStorage
+        fixture.Navigate($"{fixture.ServerPathBase}/");
+        fixture.Browser.Equal("Hello", () => fixture.Browser.Exists(By.TagName("h1")).Text);
+    }
+
     private static string GrantTestId(IWebDriver browser)
     {
         var testId = Guid.NewGuid().ToString("N")[..8];