Fix RefreshCanFallBackOnFullPageReload

Author: ilonatommy

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;
@@ -49,15 +50,7 @@ private void TryCleanSessionStorage()
     {
         try
         {
-            // only tests that suppress enhanced navigation will have these items set
-            var testId = ((IJavaScriptExecutor)Browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-            if (testId == null)
-            {
-                return;
-            }
-
-            ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
-            ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
+            EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
         }
         catch (Exception ex)
         {

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);
+
         // 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.

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

@@ -47,6 +47,23 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
         }
     }
+
+    public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture)
+        where TServerFixture : ServerFixture
+    {
+        var browser = fixture.Browser;
+
+        // only tests that suppress enhanced navigation will have these items set, so it can throw
+        var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+        if (testId == null)
+        {
+            return;
+        }
+
+        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
+        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
+    }
+
     private static string GrantTestId(IWebDriver browser)
     {
         var testId = Guid.NewGuid().ToString("N")[..8];