diff --git a/src/Components/test/E2ETest/Tests/CircuitTests.cs b/src/Components/test/E2ETest/Tests/CircuitTests.cs index f4b4999c8b25..72de6e3b960c 100644 --- a/src/Components/test/E2ETest/Tests/CircuitTests.cs +++ b/src/Components/test/E2ETest/Tests/CircuitTests.cs @@ -35,7 +35,6 @@ protected override void InitializeAsyncCore() [InlineData("render-throw")] [InlineData("afterrender-sync-throw")] [InlineData("afterrender-async-throw")] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57588")] public void ComponentLifecycleMethodThrowsExceptionTerminatesTheCircuit(string id) { Browser.MountTestComponent(); @@ -44,8 +43,7 @@ public void ComponentLifecycleMethodThrowsExceptionTerminatesTheCircuit(string i var targetButton = Browser.Exists(By.Id(id)); targetButton.Click(); - // Triggering an error will show the exception UI - Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: block;']")); + DismissBlazorErrorUI(); // Clicking the button again will trigger a server disconnect targetButton.Click(); @@ -54,7 +52,6 @@ public void ComponentLifecycleMethodThrowsExceptionTerminatesTheCircuit(string i } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57588")] public void ComponentDisposeMethodThrowsExceptionTerminatesTheCircuit() { Browser.MountTestComponent(); @@ -67,7 +64,8 @@ public void ComponentDisposeMethodThrowsExceptionTerminatesTheCircuit() targetButton.Click(); // Clicking it again hides the component and invokes the rethrow which triggers the exception targetButton.Click(); - Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: block;']")); + + DismissBlazorErrorUI(); // Clicking it again causes the circuit to disconnect targetButton.Click(); @@ -95,4 +93,17 @@ void AssertLogContains(params string[] messages) Assert.Contains(log, entry => entry.Message.Contains(message)); } } + + void DismissBlazorErrorUI() + { + // Triggering an error will show the exception UI + Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: block;']")); + + // Dismiss the error UI by clicking the dismiss button + var dismissButton = Browser.Exists(By.CssSelector("#blazor-error-ui .dismiss")); + dismissButton.Click(); + + // Wait for error UI to be hidden + Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: none;']")); + } }