Merge pull request #1701 from bUnit-dev/release/v1.39

egil · web-flow · commit a6ef95f6bea8 · 2025-04-04T16:34:46.000Z
Release of new minor version v1.39
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ All notable changes to **bUnit** will be documented in this file. The project ad
 
 ## [Unreleased]
 
+### Fixed
+
+- Do not set the `Uri` or `BaseUri` property on the `FakeNavigationManager` if navigation is prevented by a handler on `net7.0` or greater. Reported and fixed by [@ayyron-dev](https://github.com/ayyron-dev) in [#1647](https://github.com/bUnit-dev/bUnit/issues/1647)
+- Use default renderer properties for AngleSharp. Reported by [@jtleaming](https://github.com/jtleaming) in [#1692].
+- `FindComponents` throws an exception, when a base and derived class was searched for. Reported by [@BlueDragon709](https://github.com/BlueDragon709) in [#1691].
+
 ## [1.38.5] - 2025-01-12
 
 ### Added
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,7 +6,7 @@
 	<!-- Shared code analyzers used for all projects in the solution -->
 	<ItemGroup Condition="!$(MSBuildProjectName.EndsWith('samples'))">
 		<GlobalPackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
-		<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
+		<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.5.0.109200" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
 		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
 		<PackageVersion Include="Meziantou.Polyfill" Version="1.0.42" />
 	</ItemGroup>
@@ -28,7 +28,7 @@
 
 	<ItemGroup Label="System.Text.Json Vulnerability">
 		<!-- Due to a CVE in System.Text.Json we explicitly reference the latest version of System.Text.Json -->
-		<PackageVersion Include="System.Text.Json" Version="9.0.0"/>
+		<PackageVersion Include="System.Text.Json" Version="9.0.1"/>
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
@@ -97,16 +97,16 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-		<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0"/>
-		<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0"/>
-		<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.0"/>
-
-		<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0"/>
-		<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.0"/>
-		<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0"/>
-		<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0"/>
-		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0"/>
-		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0"/>
+		<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1"/>
+		<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1"/>
+		<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.1"/>
+
+		<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.1"/>
+		<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.1"/>
+		<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1"/>
+		<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.1"/>
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.1"/>
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.1"/>
 	</ItemGroup>
 
 	<ItemGroup Label="Test Dependencies">
@@ -122,7 +122,7 @@
 		<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
 		<PackageVersion Include="Shouldly" Version="4.2.1"/>
 		<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0"/>
-		<PackageVersion Include="Verify.Xunit" Version="28.8.1"/>
+		<PackageVersion Include="Verify.Xunit" Version="28.9.0"/>
 		<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24"/>
 		<PackageVersion Include="coverlet.collector" Version="6.0.3" />
 		<PackageVersion Include="coverlet.msbuild" Version="6.0.3" />
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ A huge thank you to the [sponsors of bUnit](https://github.com/sponsors/egil). T
 <table border="0">
 	<tr>
 		<td align="center" width="120">
-			<a href="https://github.com/syncfusion">
+			<a href="https://www.syncfusion.com/blazor-components?utm_source=bunit&utm_medium=cpc&utm_campaign=bunit_blazor_bancy25">
 				<img class="avatar" src="https://avatars.githubusercontent.com/u/1699795?s=460" width="72" height="72" alt="@syncfusion" />
 				<br />
 				Syncfusion
diff --git a/src/bunit.core/Rendering/TestRenderer.cs b/src/bunit.core/Rendering/TestRenderer.cs
@@ -610,7 +610,13 @@ private IRenderedComponentBase<TComponent> GetOrCreateRenderedComponent<TCompone
 	{
 		if (renderedComponents.TryGetValue(componentId, out var renderedComponent))
 		{
-			return (IRenderedComponentBase<TComponent>)renderedComponent;
+			if (renderedComponent is IRenderedComponentBase<TComponent> typedComponent)
+			{
+				return typedComponent;
+			}
+
+			renderedComponent.Dispose();
+			renderedComponents.Remove(componentId);
 		}
 
 		LoadRenderTreeFrames(componentId, framesCollection);
diff --git a/src/bunit.web/Rendering/BunitHtmlParser.cs b/src/bunit.web/Rendering/BunitHtmlParser.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Diagnostics;
 using AngleSharp;
+using AngleSharp.Css;
 using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
 using Bunit.Diffing;
@@ -28,7 +29,8 @@ public sealed class BunitHtmlParser : IDisposable
 	/// with a AngleSharp context without a <see cref="TestRenderer"/> registered.
 	/// </summary>
 	public BunitHtmlParser()
-		: this(Configuration.Default.WithCss().With(new HtmlComparer())) { }
+		: this(Configuration.Default.WithCss()
+			.With(new HtmlComparer())) { }
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="BunitHtmlParser"/> class
@@ -43,7 +45,13 @@ public BunitHtmlParser(HtmlComparer htmlComparer, TestContextBase testContext)
 
 	private BunitHtmlParser(IConfiguration angleSharpConfiguration)
 	{
-		var config = angleSharpConfiguration.With(this);
+		var config = angleSharpConfiguration
+			.With(this)
+			.WithRenderDevice(new DefaultRenderDevice
+			{
+				ViewPortWidth = 1920,
+				ViewPortHeight = 1080,
+			});
 		context = BrowsingContext.New(config);
 		var parseOptions = new HtmlParserOptions
 		{
diff --git a/src/bunit.web/TestDoubles/NavigationManager/FakeNavigationManager.cs b/src/bunit.web/TestDoubles/NavigationManager/FakeNavigationManager.cs
@@ -75,13 +75,6 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 		var absoluteUri = GetNewAbsoluteUri(uri);
 		var changedBaseUri = HasDifferentBaseUri(absoluteUri);
 
-		if (changedBaseUri)
-		{
-			BaseUri = GetBaseUri(absoluteUri);
-		}
-
-		Uri = ToAbsoluteUri(uri).OriginalString;
-
 		if (options.ReplaceHistoryEntry && history.Count > 0)
 			history.Pop();
 
@@ -92,7 +85,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;
@@ -116,6 +108,12 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 			history.Push(new NavigationHistory(uri, options));
 #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
@@ -125,17 +123,13 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 			{
 				NotifyLocationChanged(isInterceptedLink: false);
 			}
-			else
-			{
-				BaseUri = GetBaseUri(absoluteUri);
-			}
 		});
 	}
 #endif
 
 #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)
diff --git a/tests/bunit.core.tests/Rendering/RenderModeTests.razor b/tests/bunit.core.tests/Rendering/RenderModeTests.razor
@@ -168,7 +168,7 @@
                 </ComponentWithChildContent>
             </ComponentWithChildContent>);
 
-		act.ShouldThrow<RenderModeMisMatchException>(); // todo: figure out good exception to use
+		act.ShouldThrow<RenderModeMisMatchException>();
     }
 }
 @code{
diff --git a/tests/bunit.core.tests/TestDoubles/PersistentComponentState/FakePersistentComponentStateTest.cs b/tests/bunit.core.tests/TestDoubles/PersistentComponentState/FakePersistentComponentStateTest.cs
@@ -67,7 +67,7 @@ public void Test013(string key)
 	{
 		var fakeState = this.AddFakePersistentComponentState();
 
-		fakeState.TryTake<string>(key, out var actual).ShouldBeFalse();
+		fakeState.TryTake<string>(key, out _).ShouldBeFalse();
 	}
 
 	[Fact(DisplayName = "TriggerOnPersisting triggers OnPersisting callbacks added to store")]
diff --git a/tests/bunit.testassets/BlazorE2E/AddRemoveChildComponents.razor b/tests/bunit.testassets/BlazorE2E/AddRemoveChildComponents.razor
@@ -10,7 +10,7 @@ Child components follow.
 
 @code {
     int numAdded = 0;
-    List<string> currentChildrenMessages = new List<string>();
+    private readonly List<string> currentChildrenMessages = new List<string>();
 
     void AddChild()
     {
diff --git a/tests/bunit.testassets/BlazorE2E/DataDashComponent.razor b/tests/bunit.testassets/BlazorE2E/DataDashComponent.razor
@@ -1,5 +1,5 @@
 <div id="cool_beans" data-tab="@TabId">@TabId</div>
 
 @code {
-    string TabId = "17";
+    private readonly string TabId = "17";
 }
diff --git a/tests/bunit.testassets/BlazorE2E/DuplicateAttributesComponent.razor b/tests/bunit.testassets/BlazorE2E/DuplicateAttributesComponent.razor
@@ -13,7 +13,7 @@
 </div>
 
 @functions {
-    Dictionary<string, object> elementValues = new Dictionary<string, object>
+	private readonly Dictionary<string, object> elementValues = new Dictionary<string, object>
     {
         { "bool",  true },
         { "string", "middle-value" },
diff --git a/tests/bunit.testassets/BlazorE2E/KeyPressEventComponent.razor b/tests/bunit.testassets/BlazorE2E/KeyPressEventComponent.razor
@@ -9,7 +9,7 @@ Type here: <input @onkeypress=OnKeyPressed />
 </ul>
 
 @code {
-    List<string> keysPressed = new List<string>();
+	private readonly List<string> keysPressed = new List<string>();
 
     void OnKeyPressed(KeyboardEventArgs eventArgs)
     {
diff --git a/tests/bunit.testassets/BlazorE2E/MarkupBlockComponent.razor b/tests/bunit.testassets/BlazorE2E/MarkupBlockComponent.razor
@@ -28,7 +28,7 @@
     #nullable disable
     bool changeOutput;
 
-    string myMarkup = "<p class='markup-string-value'>This is a <em>markup string</em>.</p>";
+    private readonly string myMarkup = "<p class='markup-string-value'>This is a <em>markup string</em>.</p>";
 
     void EmitMarkupBlock(RenderTreeBuilder builder)
     {
diff --git a/tests/bunit.testassets/BlazorE2E/MovingCheckboxesComponent.razor b/tests/bunit.testassets/BlazorE2E/MovingCheckboxesComponent.razor
@@ -41,15 +41,15 @@
 
 @code {
     #nullable disable
-    List<TodoItem> items = new List<TodoItem>
+    private readonly List<TodoItem> items = new List<TodoItem>
     {
         new TodoItem { Text = "Alpha" },
         new TodoItem { Text = "Beta" },
         new TodoItem { Text = "Gamma", IsDone = true },
         new TodoItem { Text = "Delta", IsDone = true },
     };
 
-    class TodoItem
+    private sealed class TodoItem
     {
         public bool IsDone { get; set; }
         public string Text { get; set; }
diff --git a/tests/bunit.testassets/BlazorE2E/OrderedList.razor b/tests/bunit.testassets/BlazorE2E/OrderedList.razor
@@ -6,7 +6,7 @@
     }
     @foreach (var item in Items)
     {
-        @Template(new Context { Index = index++, Item = item, });
+        @Template(new Context { Index = index++, Item = item, })
     }
 </ol>
 
diff --git a/tests/bunit.testassets/SampleComponents/AsyncRenderChangesProperty.razor b/tests/bunit.testassets/SampleComponents/AsyncRenderChangesProperty.razor
@@ -1,7 +1,7 @@
 <button id="tick" @onclick="Tick">Tick</button>
 <button id="tock" @onclick="Tock">Tock</button>
 @code {
-	private TaskCompletionSource<object?> _tcs = new TaskCompletionSource<object?>();
+	private readonly TaskCompletionSource<object?> _tcs = new TaskCompletionSource<object?>();
 	public int Counter;
 
 	private Task Tick()
diff --git a/tests/bunit.testassets/SampleComponents/ComponentWithRelativeUnitAsWidth.razor b/tests/bunit.testassets/SampleComponents/ComponentWithRelativeUnitAsWidth.razor
@@ -0,0 +1,2 @@
+<div class="my-component" style="width: 5%">
+</div>
diff --git a/tests/bunit.testassets/SampleComponents/InvokeAsyncInsideContinueWith.razor b/tests/bunit.testassets/SampleComponents/InvokeAsyncInsideContinueWith.razor
@@ -22,13 +22,13 @@
 		{
 			registeredTask = task;
 			delegatedTask = task == null ? null : DelegateTo(task);
-			RenderWhenDone();
+			_ = RenderWhenDone();
 		}
 
 		base.OnParametersSet();
 	}
 
-	private async void RenderWhenDone()
+	private async Task RenderWhenDone()
 	{
 		var task = delegatedTask;
 		if (task != null)
@@ -44,7 +44,7 @@
 
 	private static async Task<object?> DelegateTo(Task task)
 	{
-		await task;//.ConfigureAwait(false);
+		await task;
 		return null;
 	}
 }
diff --git a/tests/bunit.testassets/SampleComponents/RenderOnClick.razor b/tests/bunit.testassets/SampleComponents/RenderOnClick.razor
@@ -2,8 +2,11 @@
 
 @code {
     public int RenderCount { get; private set; }
-    
-    void IncreaseCount() { }
+
+    void IncreaseCount()
+    {
+	    // Left empty on purpose
+    }
 
     protected override void OnAfterRender(bool firstRender) => RenderCount++;
 }
diff --git a/tests/bunit.testassets/SampleComponents/SimpleUsingLocalizer.razor b/tests/bunit.testassets/SampleComponents/SimpleUsingLocalizer.razor
@@ -6,7 +6,7 @@
 @code {
 	protected override void OnInitialized()
 	{
-		var localizedString = StringLocalizer["StringName"];
+		_ = StringLocalizer["StringName"];
 	}
 
 }
diff --git a/tests/bunit.testassets/SampleComponents/SimpleWithTemplate.razor b/tests/bunit.testassets/SampleComponents/SimpleWithTemplate.razor
@@ -1,7 +1,7 @@
 @typeparam T
 @foreach (var d in Data)
 {
-	@Template?.Invoke(d);
+	@Template?.Invoke(d)
 }
 @code
 {
diff --git a/tests/bunit.testassets/SampleComponents/ToggleableDetails.razor b/tests/bunit.testassets/SampleComponents/ToggleableDetails.razor
@@ -3,7 +3,7 @@
 	{
 		<p>Read the details carefully!</p>
 	}
-	<details id="details-toggle" @ontoggle="OnToggle">
+	<details id="details-toggle" @ontoggle="@OnToggle">
 		<summary>Summary</summary>
 		<p>Detailed content</p>
 	</details>
diff --git a/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor b/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor
@@ -1,13 +1,9 @@
-@using Bunit.TestAssets
 @using Bunit.TestAssets.SampleComponents
 @inherits TestContext
 @code {
-    private readonly ITestOutputHelper outputHelper;
-
-    public MarkupMatchesTests(ITestOutputHelper outputHelper)
+    public MarkupMatchesTests()
     {
-        this.outputHelper = outputHelper;
-        TestContext.DefaultWaitTimeout = TimeSpan.FromSeconds(30);
+        DefaultWaitTimeout = TimeSpan.FromSeconds(30);
     }
 
     [Fact]
diff --git a/tests/bunit.web.tests/Rendering/RenderedComponentTest.cs b/tests/bunit.web.tests/Rendering/RenderedComponentTest.cs
diff --git a/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs b/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs
diff --git a/version.json b/version.json

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,13 @@ private IRenderedComponentBase<TComponent> GetOrCreateRenderedComponent<TCompone`
`610`	`610`	`{`
`611`	`611`	`if (renderedComponents.TryGetValue(componentId, out var renderedComponent))`
`612`	`612`	`{`
`613`		`- return (IRenderedComponentBase<TComponent>)renderedComponent;`
	`613`	`+ if (renderedComponent is IRenderedComponentBase<TComponent> typedComponent)`
	`614`	`+ {`
	`615`	`+ return typedComponent;`
	`616`	`+ }`
	`617`	`+`
	`618`	`+ renderedComponent.Dispose();`
	`619`	`+ renderedComponents.Remove(componentId);`
`614`	`620`	`}`
`615`	`621`
`616`	`622`	`LoadRenderTreeFrames(componentId, framesCollection);`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@`
`168`	`168`	`</ComponentWithChildContent>`
`169`	`169`	`</ComponentWithChildContent>);`
`170`	`170`
`171`		`- act.ShouldThrow<RenderModeMisMatchException>(); // todo: figure out good exception to use`
	`171`	`+ act.ShouldThrow<RenderModeMisMatchException>();`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`	`@code{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void Test013(string key)`
`67`	`67`	`{`
`68`	`68`	`var fakeState = this.AddFakePersistentComponentState();`
`69`	`69`
`70`		`- fakeState.TryTake<string>(key, out var actual).ShouldBeFalse();`
	`70`	`+ fakeState.TryTake<string>(key, out _).ShouldBeFalse();`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`[Fact(DisplayName = "TriggerOnPersisting triggers OnPersisting callbacks added to store")]`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Child components follow.`
`10`	`10`
`11`	`11`	`@code {`
`12`	`12`	`int numAdded = 0;`
`13`		`- List<string> currentChildrenMessages = new List<string>();`
	`13`	`+ private readonly List<string> currentChildrenMessages = new List<string>();`
`14`	`14`
`15`	`15`	`void AddChild()`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<div id="cool_beans" data-tab="@TabId">@TabId</div>`
`2`	`2`
`3`	`3`	`@code {`
`4`		`- string TabId = "17";`
	`4`	`+ private readonly string TabId = "17";`
`5`	`5`	`}`