Fix test and feedback

Author: dariatiurina

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHost.cs

@@ -172,10 +172,6 @@ internal async Task RunAsyncCore(CancellationToken cancellationToken, WebAssembl
                 var (rootComponents, renderer, initializationTcs) = state;
                 try
                 {
-                    if (Services.GetService<CultureStateProvider>() is CultureStateProvider cultureStateProvider)
-                    {
-                        cultureStateProvider.ApplyStoredCulture();
-                    }
                     // Here, we add each root component but don't await the returned tasks so that the
                     // components can be processed in parallel.
                     var count = rootComponents.Count;

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

@@ -1202,24 +1202,6 @@ public void CanPersistPrerenderedState_WebAssemblyPrerenderedStateAvailableOnlyO
         Browser.Equal("not restored", () => Browser.FindElement(By.Id("wasm")).Text);
     }
 
-    [Fact]
-    public void CanPersistCultureFromServer()
-    {
-        _serverFixture.AdditionalArguments.Add("EnforceServerCultureOnClient=true");
-        
-        Navigate($"{ServerPathBase}/Culture/SetCulture?culture=fr-FR&redirectUri={Uri.EscapeDataString($"{ServerPathBase}/persist-culture-state")}");
-        Browser.Exists(By.ClassName("return-from-culture-setter")).Click();
-
-        Browser.Equal("Prerender", () => Browser.FindElement(By.Id("prerender")).Text);
-        Browser.Equal("fr-FR", () => Browser.FindElement(By.Id("culture-set")).Text);
-        Browser.Equal("fr-FR", () => Browser.FindElement(By.Id("culture-ui-set")).Text);
-
-        Browser.Exists(By.Id("start-blazor")).Click();
-
-        Browser.Equal("Interactive", () => Browser.FindElement(By.Id("interactive")).Text);
-        Browser.Equal("fr-FR", () => Browser.FindElement(By.Id("culture-set")).Text);
-    }
-
     [Fact]
     public void DoesNotPersistCultureFromServerAsDefault()
     {

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

@@ -0,0 +1,47 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Components.TestServer.RazorComponents;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
+using OpenQA.Selenium;
+using TestServer;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
+
+[CollectionDefinition(nameof(InteractivityTest), DisableParallelization = true)]
+public class LocalizationTest : ServerTestBase<BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<App>>>
+{
+    public LocalizationTest(
+        BrowserFixture browserFixture,
+        BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<App>> serverFixture,
+        ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
+    {
+    }
+
+    protected override void InitializeAsyncCore()
+    {
+        _serverFixture.AdditionalArguments.Add("EnforceServerCultureOnClient=true");
+        base.InitializeAsyncCore();
+    }
+
+    [Fact]
+    public void CanPersistCultureFromServer()
+    {
+        Navigate($"{ServerPathBase}/Culture/SetCulture?culture=fr-FR&redirectUri={Uri.EscapeDataString($"{ServerPathBase}/persist-culture-state")}");
+        Browser.Exists(By.ClassName("return-from-culture-setter")).Click();
+
+        Browser.Equal("Prerender", () => Browser.FindElement(By.Id("prerender")).Text);
+        Browser.Equal("fr-FR", () => Browser.FindElement(By.Id("culture-set")).Text);
+        Browser.Equal("fr-FR", () => Browser.FindElement(By.Id("culture-ui-set")).Text);
+
+        Browser.Exists(By.Id("start-blazor")).Click();
+
+        Browser.Equal("Interactive", () => Browser.FindElement(By.Id("interactive")).Text);
+        Browser.Equal("fr-FR", () => Browser.FindElement(By.Id("culture-set")).Text);
+    }
+}

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

@@ -100,15 +100,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
         app.Map("/subdir", app =>
         {
-            app.UseRequestLocalization(options =>
-            {
-                options.AddSupportedCultures("en-US", "fr-FR");
-                options.AddSupportedUICultures("en-US", "fr-FR");
-                options.RequestCultureProviders.Clear();
-                options.RequestCultureProviders.Add(new CookieRequestCultureProvider());
-                options.SetDefaultCulture("en-US");
-            });
-
             app.Map("/reexecution", reexecutionApp =>
             {
                 app.Map("/trigger-404", app =>
@@ -134,6 +125,15 @@ private void ConfigureSubdirPipeline(IApplicationBuilder app, IWebHostEnvironmen
     {
         WebAssemblyTestHelper.ServeCoopHeadersIfWebAssemblyThreadingEnabled(app);
 
+        app.UseRequestLocalization(options =>
+        {
+            options.AddSupportedCultures("en-US", "fr-FR");
+            options.AddSupportedUICultures("en-US", "fr-FR");
+            options.RequestCultureProviders.Clear();
+            options.RequestCultureProviders.Add(new CookieRequestCultureProvider());
+            options.SetDefaultCulture("en-US");
+        });
+
         if (!env.IsDevelopment())
         {
             app.UseExceptionHandler("/Error", createScopeForErrors: true);