Change priority of re-execution handling and allow router to stream NotFound contents
#62178
Conversation
…o shared project + redefine test cases.
| @@ -127,36 +120,35 @@ private void Assert404ReExecuted() => | |||
| [Theory] | |||
| [InlineData(true)] | |||
| [InlineData(false)] | |||
| public void CanRenderNotFoundPageNoStreaming(bool useCustomNotFoundPage) | |||
| public void CanRenderNotFoundPage(bool streamingStarted) | |||
There was a problem hiding this comment.
This one covers the old:
CanRenderNotFoundPageNoStreaming(useCustomNotFoundPage: true),CanRenderNotFoundPageWithStreaming(useCustomNotFoundPage: true)- we used to redirect to "not-found" route here, now the behavior is same as for no-streaming, so we can consolidate them.
| [InlineData(false)] | ||
| public void CanRenderNotFoundPageWithStreaming(bool useCustomNotFoundPage) | ||
| [InlineData(true)] | ||
| public void DoesNotReExecuteIf404WasHandled(bool streamingStarted) |
There was a problem hiding this comment.
DoesNotReExecuteIf404WasHandled(streamingStarted: true) covers same content as CanRenderNotFoundPageWithStreaming(useCustomNotFoundPage: false).
DoesNotReExecuteIf404WasHandled(streamingStarted: false) covers same content as CanRenderNotFoundPageNoStreaming(useCustomNotFoundPage: false).
| [InlineData(false, false)] | ||
| [InlineData(true, false)] | ||
| [InlineData(true, true)] | ||
| public void StatusCodePagesWithReExecution(bool streaming, bool responseStarted) |
There was a problem hiding this comment.
This test does not make sense now, as long as we have the default Router in blazor app, we won't re-execute. And that is the case of all the current test setups in E2E tests. To at least check if re-execution still gets rendered properly if a 404 was set externally (not by a NavigatorManager.NotFound call), StatusCodePagesWithReExecution tests were added.
The custom Router testing and handling will be a subject of the next PR.
|
It might be connected to an issue with |
|
Adding |
Contributes to #62153.
Description
Router, then in all the cases we should renderNotFoundfragment orNotFoundPagecontents.We used to detect the status code in the rendering method to avoid flushing the response and hand-over the processing to re-execution middleware. We no longer do that and we removed nulling-out the response content type because it was done only to force re-execution middleware to process the request further.
Routerto stream-in theNotFoundcontents.We used to inject JS-redirection into the page, which changed the url and introduced inconsistent behavior in comparison to non-streaming scenarios. If we avoid doing so and we ensure
Routercan stream, we are able to change the body of the page by streaming theNotFoundfragment/page contents. We cannot change the DOM that is non-body, e.g.PageTitlebecause streaming cannot change the<head>section. Even ifPageTitle.cshas[StreamRendering]attribute. From this reason, we are checking for DOM body contents in the streaming-related cases.Components.Shared.csprojwas needed because we want the same components to be tested in global interactivity application (InteractivityTests.csthat is runningComponents.WasmMinimal.csproj) and per-component interactivity application (NoInteractivityTests.csthat is runningComponents.TestServer.csprojthat is not loadingWasmMinimalassembly). The neatest solution was to put the common components is an external razor library. We could also start loadingWasmMinimalin non-interactive tests but I decided it makes it too messy.PageThatSetsNotFoundandStreamingSetNotFoundcomponents were doing the same job as newPageThatSetsNotFound-non-streamingandPageThatSetsNotFound-streamingbut the new version is doing it in a more unified way (both use the same child component that is also used in interactive version of that test).