fix(FakeNavigationManager): Do Not set Uri if navigation is prevented on net7.0 or greater

Author: ayyron-dev

src/bunit.web/TestDoubles/NavigationManager/FakeNavigationManager.cs

@@ -80,8 +80,6 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 			BaseUri = GetBaseUri(absoluteUri);
 		}
 
-		Uri = ToAbsoluteUri(uri).OriginalString;
-
 		if (options.ReplaceHistoryEntry && history.Count > 0)
 			history.Pop();
 
@@ -92,7 +90,6 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 		testContextBase.Renderer.Dispatcher.InvokeAsync(() =>
 #endif
 		{
-			Uri = absoluteUri.OriginalString;
 
 #if NET7_0_OR_GREATER
 			var shouldContinueNavigation = false;
@@ -112,8 +109,13 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 			{
 				return;
 			}
+			else
+			{
+				Uri = ToAbsoluteUri(uri).OriginalString;
+			}
 #else
 			history.Push(new NavigationHistory(uri, options));
+			Uri = absoluteUri.OriginalString;
 #endif
 
 
@@ -135,7 +137,7 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 
 #if NET7_0_OR_GREATER
 	/// <inheritdoc/>
-	protected override void SetNavigationLockState(bool value) {}
+	protected override void SetNavigationLockState(bool value) { }
 
 	/// <inheritdoc/>
 	protected override void HandleLocationChangingHandlerException(Exception ex, LocationChangingContext context)

tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using Shouldly.ShouldlyExtensionMethods;
 
 namespace Bunit.TestDoubles;
 
@@ -135,8 +136,12 @@ public void Test200(string uri, bool forceLoad, bool replaceHistoryEntry)
 			.ShouldBeEquivalentTo(new NavigationHistory(uri,
 				new NavigationOptions { ForceLoad = forceLoad, ReplaceHistoryEntry = replaceHistoryEntry }));
 #elif NET7_0_OR_GREATER
-		var navigationOptions = new NavigationOptions { ForceLoad = forceLoad, ReplaceHistoryEntry =
- replaceHistoryEntry };
+		var navigationOptions = new NavigationOptions
+		{
+			ForceLoad = forceLoad,
+			ReplaceHistoryEntry =
+ replaceHistoryEntry
+		};
 		sut.History.ShouldHaveSingleItem()
 			.ShouldBeEquivalentTo(new NavigationHistory(uri, navigationOptions, NavigationState.Succeeded));
 #endif
@@ -156,8 +161,11 @@ public void Test201()
 				new NavigationOptions { ReplaceHistoryEntry = true }));
 #elif NET7_0_OR_GREATER
 		sut.History.ShouldHaveSingleItem()
-			.ShouldBeEquivalentTo(new NavigationHistory("/secondUrl",  new NavigationOptions { ReplaceHistoryEntry =
- true }, NavigationState.Succeeded));
+			.ShouldBeEquivalentTo(new NavigationHistory("/secondUrl", new NavigationOptions
+			{
+				ReplaceHistoryEntry =
+ true
+			}, NavigationState.Succeeded));
 #endif
 	}
 #endif
@@ -230,7 +238,8 @@ public void Test013()
 		var fakeNavigationManager = CreateFakeNavigationManager();
 		var requestOptions = new InteractiveRequestOptions
 		{
-			ReturnUrl = "return", Interaction = InteractionType.SignIn,
+			ReturnUrl = "return",
+			Interaction = InteractionType.SignIn,
 		};
 		requestOptions.TryAddAdditionalParameter("library", "bunit");
 
@@ -264,7 +273,7 @@ public void Test015()
 		Should.Throw<JsonException>(
 			() => fakeNavigationManager.History.Last().StateFromJson<InteractiveRequestOptions>());
 	}
-	
+
 	[Fact(DisplayName = "Navigate to url with state should set that state on the NavigationManager")]
 	public void Test016()
 	{
@@ -275,19 +284,39 @@ public void Test016()
 
 		sut.HistoryEntryState.ShouldBe(State);
 	}
-	
+
 	[Fact(DisplayName = "Navigate to url with force reload resets state")]
 	public void Test017()
 	{
 		const string State = "State";
 		var sut = CreateFakeNavigationManager();
 
 		sut.NavigateTo("/internal", new NavigationOptions { HistoryEntryState = State });
-		sut.NavigateTo("/internal", new NavigationOptions { HistoryEntryState = State, ForceLoad = true});
+		sut.NavigateTo("/internal", new NavigationOptions { HistoryEntryState = State, ForceLoad = true });
 
 		sut.HistoryEntryState.ShouldBe(null);
 	}
 
+	[Fact(DisplayName = "Preventing Navigation does not change Uri")]
+	public void Test018()
+	{
+		var sut = CreateFakeNavigationManager();
+		string expectedUri = new Uri(new Uri(sut.BaseUri, UriKind.Absolute), new Uri("/expected-path", UriKind.Relative)).AbsoluteUri;
+
+		sut.NavigateTo("/expected-path");
+		using var handler = sut.RegisterLocationChangingHandler(LocationChangingHandler);
+		sut.NavigateTo("/prevented-path");
+
+		sut.History.First().State.ShouldBe(NavigationState.Prevented);
+		sut.Uri.ShouldBe(expectedUri);
+
+		ValueTask LocationChangingHandler(LocationChangingContext arg)
+		{
+			arg.PreventNavigation();
+			return ValueTask.CompletedTask;
+		}
+	}
+
 	private sealed class InterceptNavigateToCounterComponent : ComponentBase
 	{
 		protected override void BuildRenderTree(RenderTreeBuilder builder)