Move the id initialization to the enhanced nav supression method.

Author: ilonatommy

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

@@ -32,48 +32,10 @@ public void Navigate(string relativeUrl)
         Browser.Navigate(_serverFixture.RootUri, relativeUrl);
     }
 
-    protected override void InitializeAsyncCore(bool supportEnhancedNavigationSuppression = false)
+    protected override void InitializeAsyncCore()
     {
-        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();
-    }
-
-    protected override void InitializeAsyncCore()
-    {
-    }
-
-    private void GrantTestId()
-    {
-        // We have to be on any page to ensure session storage is available
-        // Since PageLoadStrategy can be set to None, we need to manually wait for page load
-        Navigate(ServerPathBase);
-
-        // Wait for the page to be completely loaded (equivalent to PageLoadStrategy.Normal)
-        var wait = new OpenQA.Selenium.Support.UI.WebDriverWait(Browser, TimeSpan.FromSeconds(10));
-        wait.Until(driver =>
-        {
-            try
-            {
-                // Check if document is ready and load event has fired
-                var loadComplete = ((IJavaScriptExecutor)driver).ExecuteScript(
-                    "return document.readyState === 'complete' && performance.timing.loadEventEnd > 0");
-                return (bool)loadComplete;
-            }
-            catch
-            {
-                return false;
-            }
-        });
-
-        var testId = Guid.NewGuid().ToString("N")[..8];
-        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
     }
 }

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, supportEnhancedNavigationSuppression: true);
+        => InitializeAsync(BrowserFixture.StreamingContext);
 
     [Fact]
     public void CanNavigateToAnotherPageWhilePreservingCommonDOMElements()

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

@@ -18,14 +18,6 @@ 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 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)
             {
                 // Normally we need to navigate here first otherwise the browser isn't on the correct origin to access
@@ -34,13 +26,33 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 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);
+            }
+            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+            if (testId == null)
+            {
+                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.");
         }
     }
+    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, supportEnhancedNavigationSuppression: true);
+        return InitializeAsync(BrowserFixture.StreamingContext);
     }
 
     [Theory]

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

@@ -27,7 +27,7 @@ public StreamingRenderingTest(
     }
 
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
+        => InitializeAsync(BrowserFixture.StreamingContext);
 
     [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++, supportEnhancedNavigationSuppression: true);
+        => InitializeAsync(BrowserFixture.StreamingContext + _nextStreamingIdContext++);
 
     // Validates that we can use persisted state across server, webassembly, and auto modes, with and without
     // streaming rendering.

src/Shared/E2ETesting/BrowserTestBase.cs

@@ -58,16 +58,11 @@ public virtual Task InitializeAsync()
         return InitializeAsync("");
     }
 
-    public virtual Task InitializeAsync(string isolationContext, bool supportEnhancedNavigationSuppression = false)
+    public virtual Task InitializeAsync(string isolationContext)
     {
         InitializeBrowser(isolationContext);
-        InitializeAsyncCore(supportEnhancedNavigationSuppression);
-        return Task.CompletedTask;
-    }
-
-    protected virtual void InitializeAsyncCore(bool supportEnhancedNavigationSuppression = false)
-    {
         InitializeAsyncCore();
+        return Task.CompletedTask;
     }
 
     protected virtual void InitializeAsyncCore()