Make sure switch is in the correct position + add test with async operation before navigation.

Author: ilonatommy

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

@@ -83,18 +83,28 @@ public void NavigatesWithoutInteractivityByRequestRedirection(bool controlFlowBy
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ProgrammaticNavigationToNotExistingPathReExecutesTo404(bool streaming)
+    public void ProgrammaticNavigationToNotExistingPath_ReExecutesTo404(bool streaming)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: true);
         string streamingPath = streaming ? "-streaming" : "";
         Navigate($"{ServerPathBase}/reexecution/redirection-not-found-ssr{streamingPath}?navigate-programmatically=true");
         AssertReExecutionPageRendered();
     }
 
+    [Fact]
+    public void ProgrammaticNavigationToNotExistingPath_AfterAsyncOperation_ReExecutesTo404()
+    {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: true);
+        Navigate($"{ServerPathBase}/reexecution/redirection-not-found-ssr?doAsync=true&navigate-programmatically=true");
+        AssertReExecutionPageRendered();
+    }
+
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void LinkNavigationToNotExistingPathReExecutesTo404(bool streaming)
+    public void LinkNavigationToNotExistingPath_ReExecutesTo404(bool streaming)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: true);
         string streamingPath = streaming ? "-streaming" : "";
         Navigate($"{ServerPathBase}/reexecution/redirection-not-found-ssr{streamingPath}");
         Browser.Click(By.Id("link-to-not-existing-page"));
@@ -104,8 +114,9 @@ public void LinkNavigationToNotExistingPathReExecutesTo404(bool streaming)
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void BrowserNavigationToNotExistingPathReExecutesTo404(bool streaming)
+    public void BrowserNavigationToNotExistingPath_ReExecutesTo404(bool streaming)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: true);
         // non-existing path has to have re-execution middleware set up
         // so it has to have "reexecution" prefix. Otherwise middleware mapping
         // will not be activated, see configuration in Startup

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/RedirectionNotFound-SSR-streaming.razor

@@ -2,4 +2,4 @@
 @page "/reexecution/redirection-not-found-ssr-streaming"
 @attribute [StreamRendering(true)]
 
-<Components.WasmMinimal.Pages.NotFound.RedirectionNotFoundComponent StartStreaming="true" />
+<Components.WasmMinimal.Pages.NotFound.RedirectionNotFoundComponent DoAsyncOperationBeforeRedirection="true" />

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/RedirectionNotFound-SSR.razor

@@ -2,4 +2,9 @@
 @page "/reexecution/redirection-not-found-ssr"
 @attribute [StreamRendering(false)]
 
-<Components.WasmMinimal.Pages.NotFound.RedirectionNotFoundComponent />
+<Components.WasmMinimal.Pages.NotFound.RedirectionNotFoundComponent DoAsyncOperationBeforeRedirection="@DoAsync" />
+
+@code{
+    [SupplyParameterFromQuery(Name = "doAsync")]
+    public bool DoAsync { get; set; } = false;
+}

src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/RedirectionNotFoundComponent.razor

@@ -16,7 +16,7 @@
     public bool? NavigateProgrammatically { get; set; }
 
     [Parameter]
-    public bool StartStreaming { get; set; } = false;
+    public bool DoAsyncOperationBeforeRedirection { get; set; } = false;
 
     [Parameter]
     public bool WaitForInteractivity { get; set; } = false;
@@ -25,7 +25,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        if (StartStreaming)
+        if (DoAsyncOperationBeforeRedirection)
         {
             await Task.Yield();
         }