ID is not necessary if we're cleaning and not creating it for every test.

Author: ilonatommy

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

@@ -847,20 +847,9 @@ private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement el
             {
                 var logs = Browser.GetBrowserLogs(LogLevel.Warning);
                 logging += $"{string.Join(", ", logs.Select(l => l.Message))}\n";
+                isNavigationSuppressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
 
-                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');");
-                isNavigationSuppressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript($"return sessionStorage.getItem('{suppressKey}');");
-
-                logging += $"  suppressKey: {suppressKey}\n";
-                logging += $"  {suppressKey}: {isNavigationSuppressed}\n";
+                logging += $" isNavigationSuppressed: {isNavigationSuppressed}\n";
                 // Maybe the check was done too early to change the DOM ref, retry
             }
 

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

@@ -34,15 +34,9 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 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 = GenerateTestId(browser);
-            }
-
-            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
+            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.setItem('suppress-enhanced-navigation', 'true')");
 
-            var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");
+            var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
             Assert.True(suppressEnhancedNavigation is not null && (string)suppressEnhancedNavigation == "true",
                 "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
             _isSuppressed = true;
@@ -75,15 +69,7 @@ public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTest
                 }
                 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}')");
+            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation')");
         }
         catch (WebDriverException ex) when (ex.Message.Contains("invalid session id"))
         {
@@ -106,13 +92,6 @@ private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixtu
         fixture.Browser.Exists(By.Id("session-storage-anchor"));
     }
 
-    private static string GenerateTestId(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/testassets/Components.TestServer/RazorComponents/App.razor

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

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

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