Added tests from dotnet#62524 to fix it in one place.

Author: ilonatommy

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

@@ -151,21 +151,29 @@ public void NotFoundSetOnInitialization_ResponseNotStarted_SSR(bool hasReExecuti
         string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
         Navigate(testUrl);
 
-        if (hasCustomNotFoundPageSet)
-        {
-            AssertNotFoundPageRendered();
-        }
-        else
-        {
-            AssertNotFoundFragmentRendered();
-        }
+        AssertNotFoundRendered_ResponseNotStarted(hasCustomNotFoundPageSet);
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public void NotFoundSetOnInitialization_AfterAsyncOperation_ResponseNotStarted_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr?doAsync=true&useCustomNotFoundPage={hasCustomNotFoundPageSet}";
+        Navigate(testUrl);
+
+        AssertNotFoundRendered_ResponseNotStarted(hasCustomNotFoundPageSet);
         AssertUrlNotChanged(testUrl);
     }
 
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    // our custom router does not support NotFoundPage nor NotFound fragment to simulate most probable custom router behavior
+    // our custom router does not support NotFoundPage to simulate the most probable custom router behavior
     public void NotFoundSetOnInitialization_ResponseNotStarted_CustomRouter_SSR(bool hasReExecutionMiddleware)
     {
         string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
@@ -196,7 +204,7 @@ public void NotFoundSetOnInitialization_ResponseStarted_SSR(bool hasReExecutionM
         string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
         string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
         Navigate(testUrl);
-        AssertNotFoundRendered_ResponseStarted_Or_POST(hasReExecutionMiddleware, hasCustomNotFoundPageSet, testUrl);
+        AssertNotFoundRendered_ResponseStarted(hasReExecutionMiddleware, hasCustomNotFoundPageSet, testUrl);
         AssertUrlNotChanged(testUrl);
     }
 
@@ -210,11 +218,47 @@ public void NotFoundSetOnInitialization_ResponseStarted_EnhancedNavigationDisabl
         string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
         string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
         Navigate(testUrl);
-        AssertNotFoundRendered_ResponseStarted_Or_POST(hasReExecutionMiddleware, hasCustomNotFoundPageSet, testUrl);
+        AssertNotFoundRendered_ResponseStarted(hasReExecutionMiddleware, hasCustomNotFoundPageSet, testUrl);
         AssertUrlChanged(testUrl);
     }
 
-    private void AssertNotFoundRendered_ResponseStarted_Or_POST(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet, string testUrl)
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    // our custom router does not support NotFoundPage to simulate the most probable custom router behavior
+    public void NotFoundSetOnInitialization_ResponseStarted_CustomRouter_SSR(bool hasReExecutionMiddleware)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomRouter=true";
+        Navigate(testUrl);
+
+        if (hasReExecutionMiddleware)
+        {
+            AssertReExecutionPageRendered();
+        }
+        else
+        {
+            // Apps that don't support re-execution and don't have blazor's router,
+            // cannot render custom NotFound contents.
+            // The browser will display default 404 page.
+            AssertBrowserDefaultNotFoundViewRendered();
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    private void AssertNotFoundRendered_ResponseNotStarted(bool hasCustomNotFoundPageSet)
+    {
+        if (hasCustomNotFoundPageSet)
+        {
+            AssertNotFoundPageRendered();
+        }
+        else
+        {
+            AssertNotFoundContentNotRendered();
+        }
+    }
+
+    private void AssertNotFoundRendered_ResponseStarted(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet, string testUrl)
     {
         if (hasCustomNotFoundPageSet)
         {
@@ -243,7 +287,33 @@ public void NotFoundSetOnFormSubmit_ResponseNotStarted_SSR(bool hasReExecutionMi
         Navigate(testUrl);
         Browser.FindElement(By.Id("not-found-form")).FindElement(By.TagName("button")).Click();
 
-        AssertNotFoundRendered_ResponseStarted_Or_POST(hasReExecutionMiddleware, hasCustomNotFoundPageSet, testUrl);
+        AssertNotFoundRendered_ResponseNotStarted(hasCustomNotFoundPageSet);
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public void NotFoundSetOnFormSubmit_AfterAsyncOperation_ResponseNotStarted_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/post-not-found-ssr?doAsync=true&useCustomNotFoundPage={hasCustomNotFoundPageSet}";
+        Navigate(testUrl);
+        Browser.FindElement(By.Id("not-found-form")).FindElement(By.TagName("button")).Click();
+
+        AssertNotFoundRendered_ResponseNotStarted(hasCustomNotFoundPageSet);
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Fact]
+    public void NotFoundSetOnFormSubmit_ResponseNotStarted_CustomRouter_SSR()
+    {
+        string testUrl = $"{ServerPathBase}/reexecution/post-not-found-ssr?useCustomRouter=true";
+        Navigate(testUrl);
+
+        AssertReExecutionPageRendered();
         AssertUrlNotChanged(testUrl);
     }
 
@@ -259,12 +329,19 @@ public void NotFoundSetOnFormSubmit_ResponseStarted_SSR(bool hasReExecutionMiddl
         Navigate(testUrl);
         Browser.FindElement(By.Id("not-found-form")).FindElement(By.TagName("button")).Click();
 
-        AssertNotFoundRendered_ResponseStarted_Or_POST(hasReExecutionMiddleware, hasCustomNotFoundPageSet, testUrl);
+        AssertNotFoundRendered_ResponseStarted(hasReExecutionMiddleware, hasCustomNotFoundPageSet, testUrl);
         AssertUrlNotChanged(testUrl);
     }
 
-    private void AssertNotFoundFragmentRendered() =>
-        Browser.Equal("There's nothing here", () => Browser.FindElement(By.Id("not-found-fragment")).Text);
+    [Fact]
+    public void NotFoundSetOnFormSubmit_ResponseStarted_CustomRouter_SSR()
+    {
+        string testUrl = $"{ServerPathBase}/reexecution/post-not-found-ssr-streaming?useCustomRouter=true";
+        Navigate(testUrl);
+
+        AssertReExecutionPageRendered();
+        AssertUrlNotChanged(testUrl);
+    }
 
     private void AssertNotFoundContentNotRendered() =>
         Browser.Equal("Any content", () => Browser.FindElement(By.Id("test-info")).Text);

src/Components/test/testassets/TestContentPackage/NotFound/ComponentThatPostsNotFound.razor

@@ -16,14 +16,14 @@
 
 @code{
     [Parameter]
-    public bool StartStreaming { get; set; } = false;
+    public bool DoAsyncOperationBeforeSettingNotFound { get; set; } = false;
 
     [Parameter]
     public bool WaitForInteractivity { get; set; } = false;
 
     private async Task HandleSubmit()
     {
-        if (StartStreaming)
+        if (DoAsyncOperationBeforeSettingNotFound)
         {
             await Task.Yield();
         }

src/Components/test/testassets/TestContentPackage/NotFound/ComponentThatSetsNotFound.razor

@@ -10,14 +10,14 @@
 
 @code{
     [Parameter]
-    public bool StartStreaming { get; set; } = false;
+    public bool DoAsyncOperationBeforeSettingNotFound { get; set; } = false;
 
     [Parameter]
     public bool WaitForInteractivity { get; set; } = false;
 
     protected async override Task OnInitializedAsync()
     {
-        if (StartStreaming)
+        if (DoAsyncOperationBeforeSettingNotFound)
         {
             await Task.Yield();
         }

src/Components/test/testassets/TestContentPackage/NotFound/PageThatPostsNotFound-no-streaming.razor

@@ -8,4 +8,9 @@
     interactive later if interactivity was enabled in the app
 *@
 
-<TestContentPackage.NotFound.ComponentThatPostsNotFound />
+<TestContentPackage.NotFound.ComponentThatPostsNotFound DoAsyncOperationBeforeSettingNotFound="@DoAsync" />
+
+@code{
+    [SupplyParameterFromQuery(Name = "doAsync")]
+    public bool DoAsync { get; set; } = false;
+}

src/Components/test/testassets/TestContentPackage/NotFound/PageThatPostsNotFound-streaming.razor

@@ -8,4 +8,4 @@
     interactive later if interactivity was enabled in the app
 *@
 
-<TestContentPackage.NotFound.ComponentThatPostsNotFound StartStreaming="true"/>
+<TestContentPackage.NotFound.ComponentThatPostsNotFound DoAsyncOperationBeforeSettingNotFound="true"/>

src/Components/test/testassets/TestContentPackage/NotFound/PageThatSetsNotFound-no-streaming.razor

@@ -8,4 +8,9 @@
     interactive later if interactivity was enabled in the app
 *@
 
-<TestContentPackage.NotFound.ComponentThatSetsNotFound />
+<TestContentPackage.NotFound.ComponentThatSetsNotFound DoAsyncOperationBeforeSettingNotFound="@DoAsync" />
+
+@code{
+    [SupplyParameterFromQuery(Name = "doAsync")]
+    public bool DoAsync { get; set; } = false;
+}

src/Components/test/testassets/TestContentPackage/NotFound/PageThatSetsNotFound-streaming.razor

@@ -8,4 +8,4 @@
     interactive later if interactivity was enabled in the app
 *@
 
-<TestContentPackage.NotFound.ComponentThatSetsNotFound StartStreaming="true"/>
+<TestContentPackage.NotFound.ComponentThatSetsNotFound DoAsyncOperationBeforeSettingNotFound="true"/>