Add stopping renderer tests.

Author: ilonatommy

src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs

@@ -97,19 +97,6 @@ public void CanReadUrlHashOnlyOnceConnected()
             () => Browser.Exists(By.TagName("strong")).Text);
     }
 
-    [Fact]
-    public async Task CannotRedirectWhenExceptionIsThrownDuringPrerendering()
-    {
-        var requestUri = new Uri(
-            _serverFixture.RootUri,
-            "prerendered/prerendered-redirection?destination=base/relative");
-
-        var httpClient = new HttpClient(new HttpClientHandler { AllowAutoRedirect = false });
-        var response = await httpClient.GetAsync(requestUri);
-
-        Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
-    }
-
     [Theory]
     [InlineData(null, null)]
     [InlineData(null, "Bert")]

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

@@ -66,4 +66,53 @@ public void PostRequestRendersEndStateOfComponentsOnSSRPage()
 
         Browser.Equal("loaded child", () => Browser.Exists(By.Id("child")).Text);
     }
+
+    [Theory]
+    [InlineData(false, "ServerPrerendered", true)]
+    [InlineData(false, "ServerPrerendered", false)]
+    [InlineData(true, "ServerPrerendered", false)]
+    [InlineData(true, "ServerNonPrerendered", false)]
+    [InlineData(true, "WebAssemblyPrerendered", false)]
+    [InlineData(true, "WebAssemblyNonPrerendered", false)]
+    public async Task RenderBatchQueuedAfterRedirectionIsNotProcessed(bool redirect, string renderMode, bool throwSync)
+    {
+        string relativeUri = $"subdir/stopping-renderer?renderMode={renderMode}";
+        if (redirect)
+        {
+            relativeUri += $"&destination=redirect";
+        }
+
+        // async operation forces the next render batch
+        if (throwSync)
+        {
+            relativeUri += $"&delay=0";
+        }
+        else
+        {
+            relativeUri += $"&delay=1";
+        }
+
+        var requestUri = new Uri(_serverFixture.RootUri, relativeUri);
+        var httpClient = new HttpClient(new HttpClientHandler { AllowAutoRedirect = false });
+        var response = await httpClient.GetAsync(requestUri);
+
+        if (redirect)
+        {
+            var expectedUri = new Uri(_serverFixture.RootUri, "subdir/redirect");
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expectedUri, response.Headers.Location);
+        }
+        else
+        {
+            // the status code cannot be changed after it got set, so async throwing returns OK
+            if (throwSync)
+            {
+                Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            }
+            else
+            {
+                Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            }
+        }
+    }
 }

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

@@ -59,7 +59,7 @@ else
         object key = DisableKeys ? null : counter.Id;
 
         <Counter
-            @rendermode="@GetRenderMode(counter.RenderModeId)"
+            @rendermode="@RenderModeHelper.GetRenderMode(counter.RenderModeId)"
             @key="@key"
             IdSuffix="@counter.Id.ToString()"
             IncrementAmount="counter.IncrementAmount"
@@ -201,30 +201,6 @@ else
             $"&{nameof(DisableKeys)}={disableKeys}";
     }
 
-    private static IComponentRenderMode GetRenderMode(RenderModeId renderMode)
-    {
-        return renderMode switch
-        {
-            RenderModeId.ServerPrerendered => RenderMode.InteractiveServer,
-            RenderModeId.ServerNonPrerendered => new InteractiveServerRenderMode(false),
-            RenderModeId.WebAssemblyPrerendered => RenderMode.InteractiveWebAssembly,
-            RenderModeId.WebAssemblyNonPrerendered => new InteractiveWebAssemblyRenderMode(false),
-            RenderModeId.AutoPrerendered => RenderMode.InteractiveAuto,
-            RenderModeId.AutoNonPrerendered => new InteractiveAutoRenderMode(false),
-            _ => throw new InvalidOperationException($"Unknown render mode: {renderMode}"),
-        };
-    }
-
-    private enum RenderModeId
-    {
-        ServerPrerendered = 0,
-        ServerNonPrerendered = 1,
-        WebAssemblyPrerendered = 2,
-        WebAssemblyNonPrerendered = 3,
-        AutoPrerendered = 4,
-        AutoNonPrerendered = 5,
-    }
-
     private record struct CounterInfo(int Id, int IncrementAmount, RenderModeId RenderModeId);
 
     private record ComponentState(ImmutableArray<CounterInfo> Counters, int NextCounterId)

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Rendering/AsyncComponent.razor

@@ -0,0 +1,28 @@
+@if(throwException)
+{
+    throw new InvalidOperationException("Child component UI exception: redirection should have stopped renderer.");
+}
+
+@code {
+    [Parameter]
+    public int Delay { get; set; }
+
+    private bool throwException { get; set; }
+
+    private string message = string.Empty;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await Task.Yield();
+        _ = ScheduleRenderingExceptionAfterDelay();
+    }
+
+    private async Task ScheduleRenderingExceptionAfterDelay()
+    {
+        // This update should not happen if the renderer is stopped
+        await Task.Delay(Delay);
+        throwException = true;
+        StateHasChanged();
+    }
+}
+

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Rendering/StoppingRenderer.razor

@@ -0,0 +1,27 @@
+@page "/stopping-renderer"
+@inject NavigationManager NavigationManager
+
+<p>Parent content</p>
+<AsyncComponent @rendermode="@RenderModeHelper.GetRenderMode(CurrentRenderMode)" Delay="@Delay" />
+
+@code {
+    [Parameter, SupplyParameterFromQuery(Name = "destination")]
+    public string Destination { get; set; } = string.Empty;
+
+    [Parameter, SupplyParameterFromQuery(Name = "renderMode")]
+    public string? RenderModeStr { get; set; }
+
+    [Parameter, SupplyParameterFromQuery(Name = "delay")]
+    public int Delay { get; set; }
+
+    private RenderModeId CurrentRenderMode => RenderModeHelper.ParseRenderMode(RenderModeStr);
+
+    protected override Task OnInitializedAsync()
+    {
+        if (!string.IsNullOrEmpty(Destination))
+        {
+            NavigationManager.NavigateTo(Destination);
+        }
+        return Task.CompletedTask;
+    }
+}

src/Components/test/testassets/Components.TestServer/RenderModeHelper.cs

@@ -0,0 +1,46 @@
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
+
+namespace TestServer;
+
+public static class RenderModeHelper
+{
+    public static IComponentRenderMode GetRenderMode(RenderModeId renderMode)
+    {
+        return renderMode switch
+        {
+            RenderModeId.ServerPrerendered => RenderMode.InteractiveServer,
+            RenderModeId.ServerNonPrerendered => new InteractiveServerRenderMode(false),
+            RenderModeId.WebAssemblyPrerendered => RenderMode.InteractiveWebAssembly,
+            RenderModeId.WebAssemblyNonPrerendered => new InteractiveWebAssemblyRenderMode(false),
+            RenderModeId.AutoPrerendered => RenderMode.InteractiveAuto,
+            RenderModeId.AutoNonPrerendered => new InteractiveAutoRenderMode(false),
+            _ => throw new InvalidOperationException($"Unknown render mode: {renderMode}"),
+        };
+    }
+
+    public static RenderModeId ParseRenderMode(string? renderModeStr)
+    {
+        if (!string.IsNullOrEmpty(renderModeStr) &&
+            Enum.TryParse<RenderModeId>(renderModeStr, ignoreCase: true, out var result))
+        {
+            return result;
+        }
+        return RenderModeId.AutoNonPrerendered;
+    }
+
+}
+
+public enum RenderModeId
+{
+    ServerPrerendered = 0,
+    ServerNonPrerendered = 1,
+    WebAssemblyPrerendered = 2,
+    WebAssemblyNonPrerendered = 3,
+    AutoPrerendered = 4,
+    AutoNonPrerendered = 5,
+}