From 6f9bc53717f50883cc1760bcee5587d176f0855e Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Fri, 5 Sep 2025 17:40:30 +0200 Subject: [PATCH 1/2] Test on CI. --- .../ServerRenderingTests/EnhancedNavigationTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs index 158cc2d42c8d..a1b3d0f91b50 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs @@ -526,13 +526,13 @@ public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWeb Browser.Exists(By.TagName("nav")).FindElement(By.LinkText("LocationChanged/LocationChanging event (server-and-wasm)")).Click(); Browser.Equal("Page with location changed components", () => Browser.Exists(By.TagName("h1")).Text); - Assert.EndsWith("/nav/location-changed/server-and-wasm", Browser.Exists(By.Id("nav-uri-server")).Text); - Assert.EndsWith("/nav/location-changed/server-and-wasm", Browser.Exists(By.Id("nav-uri-wasm")).Text); + Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith("/nav/location-changed/server-and-wasm")); + Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith("/nav/location-changed/server-and-wasm")); Browser.Exists(By.Id($"update-query-string-{runtimeThatInvokedNavigation}")).Click(); - Assert.EndsWith($"/nav/location-changed/server-and-wasm?query=1", Browser.Exists(By.Id($"nav-uri-server")).Text); - Assert.EndsWith($"/nav/location-changed/server-and-wasm?query=1", Browser.Exists(By.Id($"nav-uri-wasm")).Text); + Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith("/nav/location-changed/server-and-wasm?query=1")); + Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith("/nav/location-changed/server-and-wasm?query=1")); } [Theory] From 7e65dc5bb7d9a6851bf73dcab34ca17020cf139c Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Mon, 8 Sep 2025 08:38:23 +0200 Subject: [PATCH 2/2] Fix CA1310 error. --- .../EnhancedNavigationTest.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs index a1b3d0f91b50..8f47410c5fb1 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs @@ -526,13 +526,21 @@ public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWeb Browser.Exists(By.TagName("nav")).FindElement(By.LinkText("LocationChanged/LocationChanging event (server-and-wasm)")).Click(); Browser.Equal("Page with location changed components", () => Browser.Exists(By.TagName("h1")).Text); - Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith("/nav/location-changed/server-and-wasm")); - Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith("/nav/location-changed/server-and-wasm")); + Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith( + "/nav/location-changed/server-and-wasm", + StringComparison.Ordinal)); + Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith( + "/nav/location-changed/server-and-wasm", + StringComparison.Ordinal)); Browser.Exists(By.Id($"update-query-string-{runtimeThatInvokedNavigation}")).Click(); - Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith("/nav/location-changed/server-and-wasm?query=1")); - Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith("/nav/location-changed/server-and-wasm?query=1")); + Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith( + "/nav/location-changed/server-and-wasm?query=1", + StringComparison.Ordinal)); + Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith( + "/nav/location-changed/server-and-wasm?query=1", + StringComparison.Ordinal)); } [Theory]