Run entire E2E test with consistent enhanced navigation suppression setting

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

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
@@ -31,6 +32,12 @@ public void Navigate(string relativeUrl)
         Browser.Navigate(_serverFixture.RootUri, relativeUrl);
     }
 
+    public override async Task DisposeAsync()
+    {
+        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
+        await base.DisposeAsync();
+    }
+
     protected override void InitializeAsyncCore()
     {
         // Clear logs - we check these during tests in some cases.

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

@@ -317,6 +317,9 @@ public void RefreshCanFallBackOnFullPageReload(string renderMode)
         Browser.Navigate().Refresh();
         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, 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
         // across renders to ensure that a full page reload occurs.
@@ -677,11 +680,10 @@ public void CanUpdateHrefOnLinkTagWithIntegrity()
     }
 
     [Theory]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60875")]
-    // [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(false, false, false)]
     [InlineData(false, true, false)]
     [InlineData(true, true, false)]
-    // [InlineData(true, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(true, false, false)]
     // [InlineData(false, false, true)] programmatic navigation doesn't work without enhanced navigation
     [InlineData(false, true, true)]
     [InlineData(true, true, true)]
@@ -692,8 +694,8 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnNavigation(bool enable
         // or to the beginning of a fragment, regardless of the previous scroll position
         string landingPageSuffix = enableStreaming ? "" : "-no-streaming";
         string buttonKeyword = programmaticNavigation ? "-programmatic" : "";
+        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation);
         Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
-        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation, skipNavigation: true);
 
         // "landing" page: scroll maximally down and go to "next" page - we should land at the top of that page
         AssertWeAreOnLandingPage();
@@ -732,10 +734,10 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnNavigation(bool enable
     }
 
     [Theory]
-    // [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(false, false, false)]
     [InlineData(false, true, false)]
     [InlineData(true, true, false)]
-    // [InlineData(true, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(true, false, false)]
     // [InlineData(false, false, true)] programmatic navigation doesn't work without enhanced navigation
     [InlineData(false, true, true)]
     [InlineData(true, true, true)]
@@ -745,8 +747,8 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnBackwardsForwardsActio
         // This test checks if the scroll position is preserved after backwards/forwards action
         string landingPageSuffix = enableStreaming ? "" : "-no-streaming";
         string buttonKeyword = programmaticNavigation ? "-programmatic" : "";
+        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation);
         Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
-        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation, skipNavigation: true);
 
         // "landing" page: scroll to pos1, navigate away
         AssertWeAreOnLandingPage();
@@ -831,6 +833,7 @@ private void AssertScrollPositionCorrect(bool useEnhancedNavigation, long previo
     private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement elementForStalenessCheck, int retryCount = 3, int delayBetweenRetriesMs = 1000)
     {
         bool enhancedNavigationDetected = false;
+        string logging = "";
         for (int i = 0; i < retryCount; i++)
         {
             try
@@ -841,15 +844,31 @@ private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement el
             }
             catch (XunitException)
             {
+                var logs = Browser.GetBrowserLogs(LogLevel.Warning);
+                logging += $"{string.Join(", ", logs.Select(l => l.Message))}\n";
+
+                var testId = ((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('test-id');");
+                logging += $"  testId: {testId}\n";
+                if (testId is null)
+                {
+                    continue;
+                }
+                var suppressKey = $"suppress-enhanced-navigation-{testId}";
+
+                var enhancedNavAttached = ((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('blazor-enhanced-nav-attached');");
+                var suppressEnhancedNavigation = ((IJavaScriptExecutor)Browser).ExecuteScript($"return sessionStorage.getItem('{suppressKey}');");
+
+                logging += $"  suppressKey: {suppressKey}\n";
+                logging += $"  {suppressKey}: {suppressEnhancedNavigation}\n";
                 // Maybe the check was done too early to change the DOM ref, retry
             }
 
             Thread.Sleep(delayBetweenRetriesMs);
         }
-        string expectedNavigation = useEnhancedNavigation ? "enhanced navigation" : "browser navigation";
+        string expectedNavigation = useEnhancedNavigation ? "enhanced navigation" : "full page load";
         string isStale = enhancedNavigationDetected ? "is not stale" : "is stale";
-        var isNavigationSupressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
-        throw new Exception($"Expected to use {expectedNavigation} because 'suppress-enhanced-navigation' is set to {isNavigationSupressed} but the element from previous path {isStale}");
+        var isNavigationSuppressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
+        throw new Exception($"Expected to use {expectedNavigation} because 'suppress-enhanced-navigation' is set to {isNavigationSuppressed} but the element from previous path {isStale}. logging={logging}");
     }
 
     private void AssertWeAreOnLandingPage()

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

@@ -20,14 +20,75 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
 
             if (!skipNavigation)
             {
-                // Normally we need to navigate here first otherwise the browser isn't on the correct origin to access
-                // localStorage. 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);
+                NavigateToOrigin(fixture);
             }
 
-            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.setItem('suppress-enhanced-navigation', 'true')");
+            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))
+            {
+                testId = GrantTestId(browser);
+            }
+
+            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
+
+            var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");
+            Assert.True(suppressEnhancedNavigation is not null && (string)suppressEnhancedNavigation == "true",
+                "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
+        }
+    }
+
+    public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool skipNavigation = false)
+        where TServerFixture : ServerFixture
+    {
+        var browser = fixture.Browser;
+
+        // 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))
+        {
+            return;
+        }
+
+        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
+        ((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];
+        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+        return testId;
     }
 
     public static long GetScrollY(this IWebDriver browser)

src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor

@@ -137,10 +137,10 @@
             }
 
             const enableClassicInitializers = sessionStorage.getItem('enable-classic-initializers') === 'true';
-            const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
+            const testId = sessionStorage.getItem('test-id');
+            const suppressEnhancedNavigation = testId ? sessionStorage.getItem(`suppress-enhanced-navigation-${testId}`) === 'true' : false;
             const blockLoadBootResource = sessionStorage.getItem('block-load-boot-resource') === 'true';
             const blockWebassemblySettings = sessionStorage.getItem('block-webassembly-settings') === 'true';
-            sessionStorage.removeItem('suppress-enhanced-navigation');
             sessionStorage.removeItem('block-load-boot-resource');
             sessionStorage.removeItem('enable-classic-initializers');
             sessionStorage.removeItem('block-webassembly-settings');

src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor

@@ -14,7 +14,8 @@
 
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script>
-        const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
+        const testId = sessionStorage.getItem('test-id');
+        const suppressEnhancedNavigation = testId ? sessionStorage.getItem(`suppress-enhanced-navigation-${testId}`) === 'true' : false;
 
         let pwr = Promise.withResolvers();
         let reconnectPromise = pwr.promise;
@@ -40,7 +41,6 @@
             };
         }
 
-        sessionStorage.removeItem('suppress-enhanced-navigation');
         function callBlazorStart() {
             Blazor.start({
                 ssr: {

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;
     }