Per page interactivity test.

Author: ilonatommy

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

@@ -21,9 +21,9 @@ public class StatusCodePagesTest(BrowserFixture browserFixture, BasicTestAppServ
 {
 
     [Fact]
-    public async Task StatusCodePagesWithReexecution()
+    public void StatusCodePagesWithReexecution()
     {
-        Navigate($"{ServerPathBase}/set-not-found");
+        Navigate($"{ServerPathBase}/reexecution/set-not-found");
 
         Browser.Equal("Re-executed page", () => Browser.Title);
         var infoText = Browser.FindElement(By.Id("test-info")).Text;

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

@@ -76,6 +76,13 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.Map("/reexecution", reexecutionApp =>
             {
                 reexecutionApp.UseStatusCodePagesWithReExecute("/not-found-reexecute", true);
+
+                reexecutionApp.UseRouting();
+                reexecutionApp.UseAntiforgery();
+                reexecutionApp.UseEndpoints(endpoints =>
+                {
+                    endpoints.MapRazorComponents<TRootComponent>();
+                });
             });
 
             ConfigureSubdirPipeline(app, env);

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor

@@ -1,4 +1,5 @@
 @page "/"
+@page "/reexecution"
 
 <PageTitle>Home</PageTitle>
 

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/ReexecutedPage.razor

@@ -3,4 +3,4 @@
 <PageTitle>Re-executed page</PageTitle>
 
 <h3 id="test-info">Welcome On Page Re-executed After Not Found Event</h3>
-<p>This page is shown when UseStatusCodePagesWithReExecute is set and another page sensitive 404</p>
+<p>This page is shown when UseStatusCodePagesWithReExecute is set and another page sets 404</p>

src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesExtensions.cs

@@ -199,14 +199,14 @@ public static IApplicationBuilder UseStatusCodePagesWithReExecute(
             HandleAsync = CreateHandler(pathFormat, queryFormat),
             CreateScopeForErrors = createScopeForErrors
         };
-        return app.UseMiddleware<StatusCodePagesMiddleware>(options);
+        var wrappedOptions = new OptionsWrapper<StatusCodePagesOptions>(options);
+        return app.UseMiddleware<StatusCodePagesMiddleware>(wrappedOptions);
     }
 
     private static Func<StatusCodeContext, Task> CreateHandler(string pathFormat, string? queryFormat, RequestDelegate? next = null)
     {
         var handler = async (StatusCodeContext context) =>
         {
-            // context.Options.CreateScopeForErrors
             var originalStatusCode = context.HttpContext.Response.StatusCode;
 
             var newPath = new PathString(
@@ -221,7 +221,7 @@ private static Func<StatusCodeContext, Task> CreateHandler(string pathFormat, st
             var routeValuesFeature = context.HttpContext.Features.Get<IRouteValuesFeature>();
             var oldScope = context.Options.CreateScopeForErrors ? context.HttpContext.RequestServices : null;
             await using AsyncServiceScope? scope = context.Options.CreateScopeForErrors
-                ? context.HttpContext.RequestServices.GetRequiredService<IServiceScopeFactory>().CreateAsyncScope() // or .GetRequiredService<IServiceScopeFactory>().CreateAsyncScope()
+                ? context.HttpContext.RequestServices.GetRequiredService<IServiceScopeFactory>().CreateAsyncScope()
                 : null;
 
             // Store the original paths so the app can check it.