From 66d2b0b0f87c97efaece84349fc7d6f767b01d06 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 5 Aug 2025 15:48:16 +0200
Subject: [PATCH 01/10] Supress enhanced nav per test.

---
 .../EnhancedNavigationTest.cs                 | 36 +++++++++++++------
 .../EnhancedNavigationTestUtil.cs             | 13 +++++--
 .../RazorComponents/App.razor                 |  4 +--
 .../RazorComponents/Root.razor                |  4 +--
 4 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 7dfaf3523287..f68805604514 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -677,11 +677,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 +691,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" : "";
-        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
         EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation, skipNavigation: true);
+        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
 
         // "landing" page: scroll maximally down and go to "next" page - we should land at the top of that page
         AssertWeAreOnLandingPage();
@@ -732,10 +731,10 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnNavigation(bool enable
     }
 
     [Theory]
-    // [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
     [InlineData(false, true, false)]
     [InlineData(true, true, false)]
-    // [InlineData(true, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(true, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
     // [InlineData(false, false, true)] programmatic navigation doesn't work without enhanced navigation
     [InlineData(false, true, true)]
     [InlineData(true, true, true)]
@@ -745,8 +744,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" : "";
-        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
         EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation, skipNavigation: true);
+        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
 
         // "landing" page: scroll to pos1, navigate away
         AssertWeAreOnLandingPage();
@@ -831,6 +830,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 +841,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()
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 799b915f8fdd..1c3444f3a030 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
+using OpenQA.Selenium.BiDi.Communication;
 
 namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 
@@ -21,12 +22,20 @@ 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.
+                // 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);
             }
 
-            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.setItem('suppress-enhanced-navigation', 'true')");
+            // Set the suppression flag - this will prevent enhanced navigation from being attached on the next navigation
+            // and trigger detachment of currently attached enhanced navigation via the periodic check
+            var testId = Guid.NewGuid().ToString("N")[..8];
+            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+            ((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.");
         }
     }
 
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
index 012dcc5547f8..7b8af1442eea 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
+++ b/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');
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
index 07a5daa32bde..098813212786 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
+++ b/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: {

From 4b1f572e94f203ee40c45671096d9e694d2dba01 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 5 Aug 2025 16:05:29 +0200
Subject: [PATCH 02/10] Each test should have a testId.

---
 .../ServerRenderingTests/EnhancedNavigationTest.cs    | 11 ++++++++---
 .../EnhancedNavigationTestUtil.cs                     |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index f68805604514..a859f388469f 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -31,7 +31,12 @@ 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);
+    {
+        var initTask =  InitializeAsync(BrowserFixture.StreamingContext);
+        var testId = Guid.NewGuid().ToString("N")[..8];
+        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+        return initTask;
+    }
 
     [Fact]
     public void CanNavigateToAnotherPageWhilePreservingCommonDOMElements()
@@ -731,10 +736,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)]
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 1c3444f3a030..edf3245ccf56 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -29,8 +29,11 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
 
             // Set the suppression flag - this will prevent enhanced navigation from being attached on the next navigation
             // and trigger detachment of currently attached enhanced navigation via the periodic check
-            var testId = Guid.NewGuid().ToString("N")[..8];
-            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+            if (testId == null)
+            {
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that the test ID is set in InitializeAsync before calling this method.");
+            }
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
 
             var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");

From 945c9dd9a0190e9a67a04a99d67e0ce1ad56a0ff Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 09:01:08 +0200
Subject: [PATCH 03/10] Move granting test id to the base class.

---
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs | 7 +------
 src/Shared/E2ETesting/BrowserTestBase.cs                   | 7 +++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index a859f388469f..4e1e8733262d 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -31,12 +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()
-    {
-        var initTask =  InitializeAsync(BrowserFixture.StreamingContext);
-        var testId = Guid.NewGuid().ToString("N")[..8];
-        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
-        return initTask;
-    }
+        => InitializeAsync(BrowserFixture.StreamingContext);
 
     [Fact]
     public void CanNavigateToAnotherPageWhilePreservingCommonDOMElements()
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 7a1927fe22cf..009c81e002c6 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -63,9 +63,16 @@ public virtual Task InitializeAsync(string isolationContext)
     {
         InitializeBrowser(isolationContext);
         InitializeAsyncCore();
+        GrantTestId();
         return Task.CompletedTask;
     }
 
+    private void GrantTestId()
+    {
+        var testId = Guid.NewGuid().ToString("N")[..8];
+        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+    }
+
     protected virtual void InitializeAsyncCore()
     {
     }

From e9bf1bffbc4b9dc32ed2a58c7c8e1a5a8f556144 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 09:03:39 +0200
Subject: [PATCH 04/10] Remove unused namespace.

---
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index edf3245ccf56..16c1e23302c5 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
-using OpenQA.Selenium.BiDi.Communication;
 
 namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 

From f9601f156cdcfef4f3ac083d44a44780e6d58594 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 11:53:28 +0200
Subject: [PATCH 05/10] Not all tests can use session storage.

---
 .../ServerRenderingTests/EnhancedNavigationTest.cs    |  2 +-
 .../FormWithParentBindingContextTest.cs               |  2 +-
 .../ServerRenderingTests/NoInteractivityTest.cs       |  2 +-
 .../E2ETest/ServerRenderingTests/RedirectionTest.cs   |  4 ++--
 .../ServerRenderingTests/StreamingRenderingTest.cs    |  2 +-
 .../test/E2ETest/Tests/StatePersistenceTest.cs        |  2 +-
 src/Shared/E2ETesting/BrowserTestBase.cs              | 11 +++++++----
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 4e1e8733262d..197976cb6334 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/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()
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
index b6948f9b766c..4a16ced80882 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
+++ b/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]
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
index a6421eb94689..7ab92ec99951 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
@@ -25,7 +25,7 @@ public NoInteractivityTest(
     }
 
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext);
+        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
 
     [Fact]
     public void NavigationManagerCanRefreshSSRPageWhenInteractivityNotPresent()
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
index 0f9b419fb847..bbae1dd89845 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
@@ -25,7 +25,7 @@ public RedirectionTest(
 
     public override async Task InitializeAsync()
     {
-        await base.InitializeAsync();
+        await base.InitializeAsync(supportEnhancedNavigationSuppression: true);
         Navigate($"{ServerPathBase}/redirect");
 
         _originalH1Element = Browser.Exists(By.TagName("h1"));
@@ -179,7 +179,7 @@ public void RedirectStreamingEnhancedGetToExternal(bool disableThrowNavigationEx
         Browser.Exists(By.LinkText("Streaming enhanced GET with external redirection")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
-    
+
 
     [Theory]
     [InlineData(true)]
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
index 5fcf6d2a3813..5918173d145a 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
+++ b/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()
diff --git a/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs b/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
index d49e4fbc5704..65f25404cf0e 100644
--- a/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
+++ b/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.
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 009c81e002c6..ce88ac4a9986 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -54,16 +54,19 @@ public Task DisposeAsync()
         return Task.CompletedTask;
     }
 
-    public virtual Task InitializeAsync()
+    public virtual Task InitializeAsync(bool supportEnhancedNavigationSuppression = false)
     {
-        return InitializeAsync("");
+        return InitializeAsync("", supportEnhancedNavigationSuppression);
     }
 
-    public virtual Task InitializeAsync(string isolationContext)
+    public virtual Task InitializeAsync(string isolationContext, bool supportEnhancedNavigationSuppression = false)
     {
         InitializeBrowser(isolationContext);
         InitializeAsyncCore();
-        GrantTestId();
+        if (supportEnhancedNavigationSuppression)
+        {
+            GrantTestId();
+        }
         return Task.CompletedTask;
     }
 

From 2cd3a188469a220aa67038183891e36f6c76c863 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 11:56:47 +0200
Subject: [PATCH 06/10] Improve exception message.

---
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 16c1e23302c5..d9ae64630472 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -31,7 +31,7 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId == null)
             {
-                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that the test ID is set in InitializeAsync before calling this method.");
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync.");
             }
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
 

From 5fd1050311f7fc3bba1ec4da3aeca74ab9bc2cbf Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 12:20:52 +0200
Subject: [PATCH 07/10] Fix build + fix multiple blank lines.

---
 .../test/E2ETest/ServerRenderingTests/RedirectionTest.cs      | 1 -
 src/Shared/E2ETesting/BrowserTestBase.cs                      | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
index bbae1dd89845..d42690c041c6 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
@@ -180,7 +180,6 @@ public void RedirectStreamingEnhancedGetToExternal(bool disableThrowNavigationEx
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
 
-
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index ce88ac4a9986..9c4bb9a9a92e 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -53,6 +53,10 @@ public Task DisposeAsync()
     {
         return Task.CompletedTask;
     }
+    public virtual Task InitializeAsync()
+    {
+        return InitializeAsync("", supportEnhancedNavigationSuppression: false);
+    }
 
     public virtual Task InitializeAsync(bool supportEnhancedNavigationSuppression = false)
     {

From 7c0bf059217fabab543288d382f94008e6ad1d67 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 12:27:21 +0200
Subject: [PATCH 08/10] redirection tests do not ned supression.

---
 .../test/E2ETest/ServerRenderingTests/RedirectionTest.cs   | 3 ++-
 src/Shared/E2ETesting/BrowserTestBase.cs                   | 7 +------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
index d42690c041c6..0f9b419fb847 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
@@ -25,7 +25,7 @@ public RedirectionTest(
 
     public override async Task InitializeAsync()
     {
-        await base.InitializeAsync(supportEnhancedNavigationSuppression: true);
+        await base.InitializeAsync();
         Navigate($"{ServerPathBase}/redirect");
 
         _originalH1Element = Browser.Exists(By.TagName("h1"));
@@ -179,6 +179,7 @@ public void RedirectStreamingEnhancedGetToExternal(bool disableThrowNavigationEx
         Browser.Exists(By.LinkText("Streaming enhanced GET with external redirection")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
+    
 
     [Theory]
     [InlineData(true)]
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 9c4bb9a9a92e..b7193813a35e 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -55,12 +55,7 @@ public Task DisposeAsync()
     }
     public virtual Task InitializeAsync()
     {
-        return InitializeAsync("", supportEnhancedNavigationSuppression: false);
-    }
-
-    public virtual Task InitializeAsync(bool supportEnhancedNavigationSuppression = false)
-    {
-        return InitializeAsync("", supportEnhancedNavigationSuppression);
+        return InitializeAsync("");
     }
 
     public virtual Task InitializeAsync(string isolationContext, bool supportEnhancedNavigationSuppression = false)

From 08c99cfa1112cacac0c0fb8039ab48bd23a51a47 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 13:35:55 +0200
Subject: [PATCH 09/10] `fixture.Navigate` clears the storage, reading testId
 has to be done first.

---
 .../EnhancedNavigationTestUtil.cs                 | 15 ++++++++-------
 .../ServerRenderingTests/NoInteractivityTest.cs   |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index d9ae64630472..0ab7471bcd14 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -18,6 +18,14 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
         {
             var browser = fixture.Browser;
 
+            // Set the suppression flag - this will prevent enhanced navigation from being attached on the next navigation
+            // and trigger detachment of currently attached enhanced navigation via the periodic check
+            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+            if (testId == null)
+            {
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync.");
+            }
+
             if (!skipNavigation)
             {
                 // Normally we need to navigate here first otherwise the browser isn't on the correct origin to access
@@ -26,13 +34,6 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
             }
 
-            // Set the suppression flag - this will prevent enhanced navigation from being attached on the next navigation
-            // and trigger detachment of currently attached enhanced navigation via the periodic check
-            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-            if (testId == null)
-            {
-                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync.");
-            }
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
 
             var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
index 7ab92ec99951..a6421eb94689 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
@@ -25,7 +25,7 @@ public NoInteractivityTest(
     }
 
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
+        => InitializeAsync(BrowserFixture.StreamingContext);
 
     [Fact]
     public void NavigationManagerCanRefreshSSRPageWhenInteractivityNotPresent()

From 73abbda76a5e019620dc6d95eff1c022999ad16e Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 13:55:07 +0200
Subject: [PATCH 10/10] NonInteractivityTests contain tests that require
 supression and tests that don't support session storage at the same time.
 Allow single tests to request id assignment.

---
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs  | 2 +-
 .../test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs    | 1 +
 src/Shared/E2ETesting/BrowserTestBase.cs                        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 0ab7471bcd14..4b6b2524207a 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -23,7 +23,7 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId == null)
             {
-                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync.");
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled for test class by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync or for a given test by calling `GrantTestId()` in the beginning of the test.");
             }
 
             if (!skipNavigation)
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
index a6421eb94689..722bdce57676 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
@@ -285,6 +285,7 @@ public void NotFoundSetOnInitialization_ResponseStarted_SSR(bool hasReExecutionM
     [InlineData(false, true)]
     public void NotFoundSetOnInitialization_ResponseStarted_EnhancedNavigationDisabled_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
     {
+        GrantTestId();
         EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, true, skipNavigation: true);
         string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
         string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index b7193813a35e..ed7c6ae54ead 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -69,7 +69,7 @@ public virtual Task InitializeAsync(string isolationContext, bool supportEnhance
         return Task.CompletedTask;
     }
 
-    private void GrantTestId()
+    protected void GrantTestId()
     {
         var testId = Guid.NewGuid().ToString("N")[..8];
         ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");