From 8b885eb9c211fd809a8e3729f3be5cdef1563cab Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 10 Sep 2025 13:45:39 +0000
Subject: [PATCH 1/3] Initial plan


From baa232951a2471534ac618d063e009fdc44e656b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 10 Sep 2025 13:54:50 +0000
Subject: [PATCH 2/3] Add QuarantinedTest attribute to
 ServerRoutingTest.NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation

Co-authored-by: oroztocil <79744616+oroztocil@users.noreply.github.com>
---
 .../test/E2ETest/ServerExecutionTests/TestSubclasses.cs  | 9 +++++++++
 src/Components/test/E2ETest/Tests/RoutingTest.cs         | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs b/src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs
index bfae1173f677..4cb6eccf30c0 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs
@@ -5,6 +5,8 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Tests;
 using Microsoft.AspNetCore.E2ETesting;
+using Microsoft.AspNetCore.InternalTesting;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests;
@@ -42,6 +44,13 @@ public ServerRoutingTest(BrowserFixture browserFixture, ToggleExecutionModeServe
         : base(browserFixture, serverFixture.WithServerExecution(), output)
     {
     }
+
+    [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61080")]
+    public override void NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation()
+    {
+        base.NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation();
+    }
 }
 
 public class ServerCascadingValueTest : CascadingValueTest
diff --git a/src/Components/test/E2ETest/Tests/RoutingTest.cs b/src/Components/test/E2ETest/Tests/RoutingTest.cs
index a094aa66f971..13977afa0fe0 100644
--- a/src/Components/test/E2ETest/Tests/RoutingTest.cs
+++ b/src/Components/test/E2ETest/Tests/RoutingTest.cs
@@ -970,7 +970,7 @@ public void NavigationLock_OverlappingNavigationsCancelExistingNavigations_PushS
     }
 
     [Fact]
-    public void NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation()
+    public virtual void NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation()
     {
         SetUrlViaPushState("/");
 

From 5d5db32f9a34e1e7ead13cdbeb1bc9cda8f61e28 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 10 Sep 2025 14:45:16 +0000
Subject: [PATCH 3/3] Apply reviewer feedback: Add QuarantinedTest attribute
 directly to RoutingTest method

Co-authored-by: oroztocil <79744616+oroztocil@users.noreply.github.com>
---
 .../test/E2ETest/ServerExecutionTests/TestSubclasses.cs  | 9 ---------
 src/Components/test/E2ETest/Tests/RoutingTest.cs         | 3 ++-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs b/src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs
index 4cb6eccf30c0..bfae1173f677 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs
@@ -5,8 +5,6 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Tests;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.InternalTesting;
-using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests;
@@ -44,13 +42,6 @@ public ServerRoutingTest(BrowserFixture browserFixture, ToggleExecutionModeServe
         : base(browserFixture, serverFixture.WithServerExecution(), output)
     {
     }
-
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61080")]
-    public override void NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation()
-    {
-        base.NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation();
-    }
 }
 
 public class ServerCascadingValueTest : CascadingValueTest
diff --git a/src/Components/test/E2ETest/Tests/RoutingTest.cs b/src/Components/test/E2ETest/Tests/RoutingTest.cs
index 13977afa0fe0..0cdefdf53d89 100644
--- a/src/Components/test/E2ETest/Tests/RoutingTest.cs
+++ b/src/Components/test/E2ETest/Tests/RoutingTest.cs
@@ -970,7 +970,8 @@ public void NavigationLock_OverlappingNavigationsCancelExistingNavigations_PushS
     }
 
     [Fact]
-    public virtual void NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation()
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61080")]
+    public void NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation()
     {
         SetUrlViaPushState("/");