Clean up tests and make them work.

Author: ilonatommy

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

@@ -1418,7 +1418,7 @@ public void NavigatesWithInteractivityByRequestRedirection(bool controlFlowByExc
     [InlineData("WebAssemblyNonPrerendered")]
     public void ProgrammaticNavigationToNotExistingPathReExecutesTo404(string renderMode)
     {
-        Navigate($"{ServerPathBase}/reexecution/redirection-not-found?render-mode={renderMode}&navigate-programmatically=true");
+        Navigate($"{ServerPathBase}/reexecution/redirection-not-found?renderMode={renderMode}&navigate-programmatically=true");
         Assert404ReExecuted();
     }
 
@@ -1428,7 +1428,7 @@ public void ProgrammaticNavigationToNotExistingPathReExecutesTo404(string render
     [InlineData("WebAssemblyNonPrerendered")]
     public void LinkNavigationToNotExistingPathReExecutesTo404(string renderMode)
     {
-        Navigate($"{ServerPathBase}/reexecution/redirection-not-found?render-mode={renderMode}");
+        Navigate($"{ServerPathBase}/reexecution/redirection-not-found?renderMode={renderMode}");
         Browser.Click(By.Id("link-to-not-existing-page"));
         Assert404ReExecuted();
     }
@@ -1442,7 +1442,7 @@ public void BrowserNavigationToNotExistingPathReExecutesTo404(string renderMode)
         // 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
-        Navigate($"{ServerPathBase}/reexecution/not-existing-page?render-mode={renderMode}");
+        Navigate($"{ServerPathBase}/reexecution/not-existing-page?renderMode={renderMode}");
         Assert404ReExecuted();
     }
 

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

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

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

@@ -75,14 +75,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             app.Map("/reexecution", reexecutionApp =>
             {
+                reexecutionApp.UseRouting();
                 reexecutionApp.UseStatusCodePagesWithReExecute("/not-found-reexecute", createScopeForErrors: true);
-
                 reexecutionApp.UseRouting();
+
                 reexecutionApp.UseAntiforgery();
-                reexecutionApp.UseEndpoints(endpoints =>
-                {
-                    endpoints.MapRazorComponents<TRootComponent>();
-                });
+                ConfigureEndpoints(reexecutionApp, env);
             });
 
             ConfigureSubdirPipeline(app, env);
@@ -106,11 +104,15 @@ private void ConfigureSubdirPipeline(IApplicationBuilder app, IWebHostEnvironmen
         {
             if (ctx.Request.Query.ContainsKey("add-csp"))
             {
-                 ctx.Response.Headers.Add("Content-Security-Policy", "script-src 'self' 'unsafe-inline'");
+                ctx.Response.Headers.Add("Content-Security-Policy", "script-src 'self' 'unsafe-inline'");
             }
             return nxt();
         });
+        ConfigureEndpoints(app, env);
+    }
 
+    private void ConfigureEndpoints(IApplicationBuilder app, IWebHostEnvironment env)
+    {
         _ = app.UseEndpoints(endpoints =>
         {
             var contentRootStaticAssetsPath = Path.Combine(env.ContentRootPath, "Components.TestServer.staticwebassets.endpoints.json");

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

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

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

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

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

@@ -0,0 +1,11 @@
+@page "/render-not-found-ssr"
+@inject NavigationManager NavigationManager
+
+<p id="test-info">Any content</p>
+
+@code{
+    protected override void OnInitialized()
+    {
+        NavigationManager.NotFound();
+    }
+}

src/Components/test/testassets/Components.WasmMinimal/Pages/NotFoundInteractiveServer.razor renamed to src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundInteractiveServer.razor

@@ -0,0 +1,19 @@
+@page "/redirection-not-found"
+@page "/reexecution/redirection-not-found"
+
+<RedirectionNotFoundComponent @rendermode="@RenderModeHelper.GetRenderMode(_renderMode)" />
+
+@code{
+    [Parameter, SupplyParameterFromQuery(Name = "renderMode")]
+    public string? RenderModeStr { get; set; }
+
+    private RenderModeId _renderMode;
+
+    protected override void OnInitialized()
+    {
+        if (!string.IsNullOrEmpty(RenderModeStr))
+        {
+            _renderMode = RenderModeHelper.ParseRenderMode(RenderModeStr);
+        }
+    }
+}