Skip to content

Commit d46f10f

Browse files
committed
Update E2E test
1 parent 542e99d commit d46f10f

File tree

6 files changed

+27
-3
lines changed

6 files changed

+27
-3
lines changed

src/Components/Components/src/PersistentState/ComponentStatePersistenceManager.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ public Task PersistStateAsync(IPersistentComponentStateStore store, Renderer ren
109109

110110
async Task PauseAndPersistState()
111111
{
112-
// Ensure that we register the services before we start persisting the state.
113-
_servicesRegistry?.RegisterForPersistence(State);
114-
115112
State.PersistingState = true;
116113

117114
if (store is IEnumerable<IPersistentComponentStateStore> compositeStore)

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,8 +1132,13 @@ public void CanPersistPrerenderedState_ServicesState_PersistsOnServer(string mod
11321132
Navigate($"{ServerPathBase}/persist-services-state?mode={mode}");
11331133
Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode")).Text);
11341134
Browser.Equal(expectedServerState, () => Browser.FindElement(By.Id("server-state")).Text);
1135+
11351136
Browser.Equal(expectedAutoState, () => Browser.FindElement(By.Id("auto-state")).Text);
11361137
Browser.Equal(expectedWebAssemblyState, () => Browser.FindElement(By.Id("wasm-state")).Text);
1138+
1139+
Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-server-state")).Text);
1140+
Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-auto-state")).Text);
1141+
Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-wasm-state")).Text);
11371142
}
11381143

11391144
[Theory]
@@ -1150,6 +1155,10 @@ public void CanPersistPrerenderedState_ServicesState_PersistsOnWasm(string mode,
11501155
Browser.Equal(expectedServerState, () => Browser.FindElement(By.Id("server-state")).Text);
11511156
Browser.Equal(expectedAutoState, () => Browser.FindElement(By.Id("auto-state")).Text);
11521157
Browser.Equal(expectedWebAssemblyState, () => Browser.FindElement(By.Id("wasm-state")).Text);
1158+
1159+
Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-server-state")).Text);
1160+
Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-auto-state")).Text);
1161+
Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-wasm-state")).Text);
11531162
}
11541163

11551164
[Fact]

src/Components/test/testassets/TestContentPackage/PersistServicesState.razor

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
@inject InteractiveAutoService InteractiveAutoState
66

77
<p>Interactive server state is <span id="server-state">@InteractiveServerState.State</span></p>
8+
<p>Filtered server state is <span id="filtered-server-state">@InteractiveServerState.FilteredState</span></p>
89
<p>Interactive webassembly state is <span id="wasm-state">@InteractiveWebAssemblyState.State</span></p>
10+
<p>Filtered webassembly state is <span id="filtered-wasm-state">@InteractiveWebAssemblyState.FilteredState</span></p>
911
<p>Interactive auto state is <span id="auto-state">@InteractiveAutoState.State</span></p>
12+
<p>Filtered auto state is <span id="filtered-auto-state">@InteractiveAutoState.FilteredState</span></p>
1013

1114
<p>Render mode: <span id="render-mode">@_renderMode</span></p>
1215

@@ -20,12 +23,18 @@
2023
if (!RendererInfo.IsInteractive)
2124
{
2225
InteractiveServerState.State = "Server state";
26+
InteractiveServerState.FilteredState = "Filtered server state";
2327
InteractiveWebAssemblyState.State = "WebAssembly state";
28+
InteractiveWebAssemblyState.FilteredState = "Filtered webassembly state";
2429
InteractiveAutoState.State = "Auto state";
30+
InteractiveAutoState.FilteredState = "Filtered auto state";
2531
}else
2632
{
2733
InteractiveServerState.State ??= "not restored";
34+
InteractiveServerState.FilteredState ??= "not restored";
2835
InteractiveWebAssemblyState.State ??= "not restored";
36+
InteractiveWebAssemblyState.FilteredState ??= "not restored";
37+
InteractiveAutoState.FilteredState ??= "not restored";
2938
InteractiveAutoState.State ??= "not restored";
3039
}
3140
}

src/Components/test/testassets/TestContentPackage/Services/InteractiveAutoService.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ public class InteractiveAutoService
1212
{
1313
[PersistentState]
1414
public string State { get; set; }
15+
16+
[PersistentState(RestoreBehavior = RestoreBehavior.SkipInitialValue)]
17+
public string FilteredState { get; set; }
1518
}

src/Components/test/testassets/TestContentPackage/Services/InteractiveServerService.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ public class InteractiveServerService
1111
{
1212
[PersistentState]
1313
public string State { get; set; }
14+
15+
[PersistentState(RestoreBehavior = RestoreBehavior.SkipInitialValue)]
16+
public string FilteredState { get; set; }
1417
}

src/Components/test/testassets/TestContentPackage/Services/InteractiveWebAssemblyService.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ public class InteractiveWebAssemblyService
1212
{
1313
[PersistentState]
1414
public string State { get; set; }
15+
16+
[PersistentState(RestoreBehavior = RestoreBehavior.SkipInitialValue)]
17+
public string FilteredState { get; set; }
1518
}

0 commit comments

Comments
 (0)