From 45d655694c7d3dca8531d1b8cf59b41cab8ec027 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 28 Mar 2024 11:28:54 +0000 Subject: [PATCH 1/4] Don't try to interact with DOM after threaded app shutdown --- .../test/E2ETest/Tests/ThreadingAppHostedTest.cs | 9 +-------- src/Components/test/E2ETest/Tests/ThreadingAppTest.cs | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/Components/test/E2ETest/Tests/ThreadingAppHostedTest.cs b/src/Components/test/E2ETest/Tests/ThreadingAppHostedTest.cs index 23d8d7bfbc32..d5fbcb451365 100644 --- a/src/Components/test/E2ETest/Tests/ThreadingAppHostedTest.cs +++ b/src/Components/test/E2ETest/Tests/ThreadingAppHostedTest.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests; public class ThreadingHostedAppTest - : ServerTestBase, IDisposable + : ServerTestBase { public class ThreadingAppServerSiteFixture : AspNetSiteServerFixture { @@ -110,11 +110,4 @@ private void WaitUntilLoaded() var app = Browser.Exists(By.TagName("app")); Browser.NotEqual("Loading...", () => app.Text); } - - public void Dispose() - { - // Make the tests run faster by navigating back to the home page when we are done - // If we don't, then the next test will reload the whole page before it starts - Browser.Exists(By.LinkText("Home")).Click(); - } } diff --git a/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs b/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs index f11528a64e37..3afb26163483 100644 --- a/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs +++ b/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests; public class ThreadingAppTest - : ServerTestBase>, IDisposable + : ServerTestBase> { public ThreadingAppTest( BrowserFixture browserFixture, @@ -127,11 +127,4 @@ private void WaitUntilLoaded() var app = Browser.Exists(By.TagName("app")); Browser.NotEqual("Loading...", () => app.Text); } - - public void Dispose() - { - // Make the tests run faster by navigating back to the home page when we are done - // If we don't, then the next test will reload the whole page before it starts - Browser.Exists(By.LinkText("Home")).Click(); - } } From ecbd4380afdd67b02a7e052b09831a44bea9a787 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 28 Mar 2024 11:35:12 +0000 Subject: [PATCH 2/4] Fix EnhancedForm... tests. Deals with #54757 --- .../FormHandlingTests/FormWithParentBindingContextTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs index c744c060b555..4b35b0c5eed0 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs @@ -1469,7 +1469,7 @@ public void SubmitButtonFormenctypeAttributeOverridesEnhancedFormEnctype() [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54757")] public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry() { - GoTo("about:blank"); + Navigate("about:blank"); var startUrl = Browser.Url; GoTo("forms/form-that-calls-navigation-manager-refresh"); @@ -1492,7 +1492,7 @@ public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54757")] public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry_Streaming() { - GoTo("about:blank"); + Navigate("about:blank"); var startUrl = Browser.Url; GoTo("forms/form-that-calls-navigation-manager-refresh-streaming"); From 25898f9b529e6220292a3c81a9e1c8aec464bd05 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 28 Mar 2024 12:11:30 +0000 Subject: [PATCH 3/4] Update Photino dependency --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 37056ac4afb6..cd9412b64e29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -314,7 +314,7 @@ 1.0.2 13.0.3 13.0.4 - 2.4.0 + 2.6.0 1.28.0 3.0.0 7.2.4 From 9d6c5d80eb99ea6d45145d7c69ca8c402a04aae7 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 28 Mar 2024 12:23:45 +0000 Subject: [PATCH 4/4] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index cd9412b64e29..898682db2734 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -314,7 +314,7 @@ 1.0.2 13.0.3 13.0.4 - 2.6.0 + 2.5.2 1.28.0 3.0.0 7.2.4