Adding changelog, updating FakeNavigatoinManager to not change baseuri on prevention; updating test case to match.

Author: ayyron-dev

CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to **bUnit** will be documented in this file. The project ad
 
 ## [Unreleased]
 
+### Fixed
+
+- Do not set the `Uri` property on the `FakeNavigationManager` if navigation is prevented by a handler on `net7.0` or greater.
+
 ## [1.38.5] - 2025-01-12
 
 ### Added

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

@@ -75,11 +75,6 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 		var absoluteUri = GetNewAbsoluteUri(uri);
 		var changedBaseUri = HasDifferentBaseUri(absoluteUri);
 
-		if (changedBaseUri)
-		{
-			BaseUri = GetBaseUri(absoluteUri);
-		}
-
 		if (options.ReplaceHistoryEntry && history.Count > 0)
 			history.Pop();
 
@@ -109,15 +104,16 @@ 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
 
+			if (changedBaseUri)
+			{
+				BaseUri = GetBaseUri(absoluteUri);
+			}
+
+			Uri = absoluteUri.OriginalString;
 
 			// Only notify of changes if user navigates within the same
 			// base url (domain). Otherwise, the user navigated away
@@ -127,10 +123,6 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 			{
 				NotifyLocationChanged(isInterceptedLink: false);
 			}
-			else
-			{
-				BaseUri = GetBaseUri(absoluteUri);
-			}
 		});
 	}
 #endif

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

@@ -107,18 +107,18 @@ public void Test007()
 	}
 
 #if !NET6_0_OR_GREATER
-		[Theory(DisplayName = "NavigateTo(uri, forceLoad) is saved in history")]
-		[InlineData("/uri", false)]
-		[InlineData("/anotherUri", true)]
-		public void Test100(string uri, bool forceLoad)
-		{
-			var sut = CreateFakeNavigationManager();
+	[Theory(DisplayName = "NavigateTo(uri, forceLoad) is saved in history")]
+	[InlineData("/uri", false)]
+	[InlineData("/anotherUri", true)]
+	public void Test100(string uri, bool forceLoad)
+	{
+		var sut = CreateFakeNavigationManager();
 
-			sut.NavigateTo(uri, forceLoad);
+		sut.NavigateTo(uri, forceLoad);
 
-			sut.History.ShouldHaveSingleItem()
-				.ShouldBeEquivalentTo(new NavigationHistory(uri, new NavigationOptions(forceLoad)));
-		}
+		sut.History.ShouldHaveSingleItem()
+			.ShouldBeEquivalentTo(new NavigationHistory(uri, new NavigationOptions(forceLoad)));
+	}
 #endif
 #if NET6_0_OR_GREATER
 	[Theory(DisplayName = "NavigateTo(uri, forceLoad, replaceHistoryEntry) is saved in history")]
@@ -297,18 +297,22 @@ public void Test017()
 		sut.HistoryEntryState.ShouldBe(null);
 	}
 
-	[Fact(DisplayName = "Preventing Navigation does not change Uri")]
-	public void Test018()
+	[Theory(DisplayName = "Preventing Navigation does not change Uri or BaseUri")]
+	[InlineData("/prevented-path")]
+	[InlineData("https://bunit.dev/uri")]
+	public void Test018(string navToUri)
 	{
 		var sut = CreateFakeNavigationManager();
-		string expectedUri = new Uri(new Uri(sut.BaseUri, UriKind.Absolute), new Uri("/expected-path", UriKind.Relative)).AbsoluteUri;
+		Uri expectedUri = new Uri(new Uri(sut.BaseUri, UriKind.Absolute), new Uri("/expected-path", UriKind.Relative));
+		string expectedBaseUri = sut.BaseUri;
 
-		sut.NavigateTo("/expected-path");
+		sut.NavigateTo(expectedUri.AbsoluteUri);
 		using var handler = sut.RegisterLocationChangingHandler(LocationChangingHandler);
-		sut.NavigateTo("/prevented-path");
+		sut.NavigateTo(navToUri);
 
 		sut.History.First().State.ShouldBe(NavigationState.Prevented);
-		sut.Uri.ShouldBe(expectedUri);
+		sut.BaseUri.ShouldBe(expectedBaseUri);
+		sut.Uri.ShouldBe(expectedUri.AbsoluteUri);
 
 		ValueTask LocationChangingHandler(LocationChangingContext arg)
 		{