Fix failing tests.

ilonatommy · ilonatommy · commit 6dcfd16fccfb · 2025-08-29T18:55:19.000+02:00
diff --git a/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html b/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html
@@ -9,6 +9,7 @@
 </head>
 <body>
     <app>Loading...</app>
+    <p id="session-storage-anchor"></p>
     <script src="_framework/blazor.webassembly.js"></script>
 </body>
 </html>
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor
@@ -1 +1 @@
-﻿<h1>Hello, world!</h1>
+﻿<h1 id="session-storage-anchor">Hello, world!</h1>
diff --git a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor
@@ -2,6 +2,8 @@
 
 <PageTitle>Current count: @_counter</PageTitle>
 
+<p id="session-storage-anchor"></p>
+
 <p>
     <span>Current count: @_counter</span><br>
     <button id="increment-count" @onclick="IncrementCounter">Increment count</button>
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html b/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html
@@ -7,6 +7,7 @@
     <link href="benchmarks/lib/minibench/style.css" rel="stylesheet" />
 </head>
 <body style="overflow: scroll;">
+    <p id="session-storage-anchor"></p>
     <div class="container" id="display"></div>
     <p class="container px-3">
         <a href="blazor-frame.html">View benchmark app ⮕</a>
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs
@@ -16,7 +16,7 @@ public ComponentWithParametersTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<PrerenderedStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/prerendered")
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
@@ -16,7 +16,7 @@ public HeadModificationPrerenderingTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<DeferredComponentContentStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/deferred-component-content")
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
@@ -20,7 +20,7 @@ public MultipleComponentsTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<MultipleComponents> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/multiple-components")
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
@@ -19,7 +19,7 @@ public PrerenderingTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<PrerenderedStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/prerendered")
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs
@@ -16,7 +16,7 @@ public ServerTransportsTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<TransportsServerStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/defaultTransport")
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs b/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
@@ -19,7 +19,7 @@ public ClientRenderingMultpleComponentsTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<MultipleComponents> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/Client/multiple-components")
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs b/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs
@@ -20,7 +20,7 @@ public ClientSideHostingTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<TestServer.StartupWithMapFallbackToClientSideBlazor> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/subdir/filepath")
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs b/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
@@ -15,7 +15,7 @@ public HostedInAlternativeBasePathTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/app")
     {
         serverFixture.AdditionalArguments.AddRange(new[] { "--UseAlternativeBasePath", "true" });
         serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost;
diff --git a/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs b/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs
@@ -15,7 +15,7 @@ public HostedInAspNetTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "")
     {
         serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost;
         serverFixture.Environment = AspNetEnvironment.Development;
diff --git a/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs b/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to the .NET Foundation under one or more agreements.
+// 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.E2ETest.Infrastructure;
@@ -15,7 +15,7 @@ public MultipleHostedAppTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "")
     {
         serverFixture.AdditionalArguments.AddRange(new[] { "--MapAllApps", "true" });
         serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost;
diff --git a/src/Components/test/E2ETest/Tests/PerformanceTest.cs b/src/Components/test/E2ETest/Tests/PerformanceTest.cs
@@ -16,7 +16,7 @@ public PerformanceTest(
         BrowserFixture browserFixture,
         BlazorWasmTestAppFixture<Wasm.Performance.TestApp.Program> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "")
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/SaveStateTest.cs b/src/Components/test/E2ETest/Tests/SaveStateTest.cs
@@ -18,7 +18,7 @@ public SaveStateTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, "save-state")
     {
         serverFixture.BuildWebHostMethod = Program.BuildWebHost<SaveState>;
         serverFixture.Environment = AspNetEnvironment.Development;
diff --git a/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs b/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs
@@ -15,7 +15,7 @@ public WebAssemblyPrerenderedTest(
         BrowserFixture browserFixture,
         TrimmingServerFixture<Wasm.Prerendered.Server.Startup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "")
     {
         serverFixture.Environment = AspNetEnvironment.Development;
     }
diff --git a/src/Components/test/testassets/BasicTestApp/HeadModification.razor b/src/Components/test/testassets/BasicTestApp/HeadModification.razor
@@ -1,4 +1,5 @@
-﻿<h3>Head modification</h3>
+﻿<p id="session-storage-anchor"></p>
+<h3>Head modification</h3>
 
 <p>
 	Title modification
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml
@@ -5,6 +5,7 @@
     Layout = "./MultipleComponentsLayout.cshtml";
 }
 
+<p id="session-storage-anchor"></p>
 
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.WebAssemblyPrerendered))
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.WebAssembly))
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml
@@ -5,6 +5,7 @@
     Layout = "./MultipleComponentsLayout.cshtml";
 }
 
+<p id="session-storage-anchor"></p>
 
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.ServerPrerendered))
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.Server))
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml
@@ -8,6 +8,7 @@
     <base href="~/" />
 </head>
 <body>
+    <p id="session-storage-anchor"></p>
     <app><component type="typeof(TestRouterWithLazyAssembly)" render-mode="ServerPrerendered" /></app>
 
     @*
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
@@ -23,6 +23,7 @@
     @* This page is used to validate the ability to preserve and restore the state of components in Blazor server and WebAssembly. *@
 </head>
 <body>
+    <p id="session-storage-anchor"></p>
     @if (script == "client")
     {
         @* This is here to keep BasicTestApp.Program.cs happy *@
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
@@ -9,6 +9,7 @@
 </head>
 <body>
     <h1 id="ready">Form test cases</h1>
+    <p id="session-storage-anchor"></p>
     <NamedFormContextNoFormContextLayout />
     <script src="@Assets["_framework/blazor.web.js"]" suppress-error="BL9992"></script>
 </body>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
@@ -9,6 +9,7 @@
 </head>
 
 <body>
+    <p id="session-storage-anchor"></p>
     <Components.WasmRemoteAuthentication.Routes @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)" />
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script src="_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js"></script>
diff --git a/src/Components/test/testassets/GlobalizationWasmApp/App.razor b/src/Components/test/testassets/GlobalizationWasmApp/App.razor
@@ -1,6 +1,8 @@
 ﻿@using System.Globalization
 @inject Microsoft.Extensions.Localization.IStringLocalizer<App> Loc
 
+<p id="session-storage-anchor"></p>
+
 <p>App's culture: <span id="culture">@CultureInfo.CurrentCulture</span></p>
 
 <p>DateTime: <span id="dateTime">@(new DateTime(2020, 09, 02))</span></p>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<h1>Hello, world!</h1>`
	`1`	`+<h1 id="session-storage-anchor">Hello, world!</h1>`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public ComponentWithParametersTest(`
`16`	`16`	`BrowserFixture browserFixture,`
`17`	`17`	`BasicTestAppServerSiteFixture<PrerenderedStartup> serverFixture,`
`18`	`18`	`ITestOutputHelper output)`
`19`		`- : base(browserFixture, serverFixture, output)`
	`19`	`+ : base(browserFixture, serverFixture, output, serverPathBase: "/prerendered")`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public HeadModificationPrerenderingTest(`
`16`	`16`	`BrowserFixture browserFixture,`
`17`	`17`	`BasicTestAppServerSiteFixture<DeferredComponentContentStartup> serverFixture,`
`18`	`18`	`ITestOutputHelper output)`
`19`		`- : base(browserFixture, serverFixture, output)`
	`19`	`+ : base(browserFixture, serverFixture, output, serverPathBase: "/deferred-component-content")`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public MultipleComponentsTest(`
`20`	`20`	`BrowserFixture browserFixture,`
`21`	`21`	`BasicTestAppServerSiteFixture<MultipleComponents> serverFixture,`
`22`	`22`	`ITestOutputHelper output)`
`23`		`- : base(browserFixture, serverFixture, output)`
	`23`	`+ : base(browserFixture, serverFixture, output, serverPathBase: "/multiple-components")`
`24`	`24`	`{`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public PrerenderingTest(`
`19`	`19`	`BrowserFixture browserFixture,`
`20`	`20`	`BasicTestAppServerSiteFixture<PrerenderedStartup> serverFixture,`
`21`	`21`	`ITestOutputHelper output)`
`22`		`- : base(browserFixture, serverFixture, output)`
	`22`	`+ : base(browserFixture, serverFixture, output, serverPathBase: "/prerendered")`
`23`	`23`	`{`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public ServerTransportsTest(`
`16`	`16`	`BrowserFixture browserFixture,`
`17`	`17`	`BasicTestAppServerSiteFixture<TransportsServerStartup> serverFixture,`
`18`	`18`	`ITestOutputHelper output)`
`19`		`- : base(browserFixture, serverFixture, output)`
	`19`	`+ : base(browserFixture, serverFixture, output, serverPathBase: "/defaultTransport")`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public ClientRenderingMultpleComponentsTest(`
`19`	`19`	`BrowserFixture browserFixture,`
`20`	`20`	`BasicTestAppServerSiteFixture<MultipleComponents> serverFixture,`
`21`	`21`	`ITestOutputHelper output)`
`22`		`- : base(browserFixture, serverFixture, output)`
	`22`	`+ : base(browserFixture, serverFixture, output, serverPathBase: "/Client/multiple-components")`
`23`	`23`	`{`
`24`	`24`	`}`
`25`	`25`