Merge pull request #643 from bUnit-dev/release/v1.6

egil · web-flow · commit 8c58c1e3e115 · 2022-02-22T15:47:24.000Z
Release of new minor version v1.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,16 @@ All notable changes to **bUnit** will be documented in this file. The project ad
 
 ## [Unreleased]
 
+A quick minor release that primiarily fixes a regression in 1.5.12.
+
+### Fixed
+
+-   `ClickAsync` could lead to bubbling exceptions from `GetDispatchEventTasks` even though they should be handled. Reported by [@aguacongas](aguacongas). Fixed by [@linkdotnet](https://github.com/linkdotnet).
+-   Added more non bubbling events to bUnit so it behaves closer to the HTML specification. [@linkdotnet](https://github.com/linkdotnet).
+
 ## [1.5.12] - 2022-02-15
 
-This first release of 2022 includes a one fix and four additions. A huge thank you to [Steven Giesel (@linkdotnet)](https://github.com/linkdotnet) and [Denis Ekart (@denisekart)](https://github.com/denisekart) for their contributions to this release.
+This first release of 2022 includes one fix and four additions. A huge thank you to [Steven Giesel (@linkdotnet)](https://github.com/linkdotnet) and [Denis Ekart (@denisekart)](https://github.com/denisekart) for their contributions to this release.
 
 Also a big shout out to **bUnit's sponsors** who helped make this release happen.
 
@@ -20,11 +27,12 @@ Also a big shout out to **bUnit's sponsors** who helped make this release happen
 
 **Other sponsors are:**
 
--   [Hassan Rezk Habib (@Garderoben)](https://github.com/hassanhabib)
+-   [Hassan Rezk Habib (@hassanhabib)](https://github.com/hassanhabib)
 -   [Jonny Larsson (@Garderoben)](https://github.com/Garderoben)
 -   [Domn Werner (@domn1995)](https://github.com/domn1995)
 -   [Mladen Macanović (@stsrki)](https://github.com/stsrki)
 -   [@ChristopheDEBOVE](https://github.com/ChristopheDEBOVE)
+-   [Steven Giesel (@linkdotnet)](https://github.com/linkdotnet)
 
 ### Added
 
@@ -41,6 +49,22 @@ Also a big shout out to **bUnit's sponsors** who helped make this release happen
 
 This release reintroduces `Stub<TComponent>` and related back into the main library, so the "preview" library `bunit.web.mock` is already obsolete. 
 
+A big shout out to **bUnit's sponsors** who helped make this release happen.
+
+**The higher tier sponsors are:**
+
+-   [Progress Telerik](https://github.com/Progress-Telerik)
+-   [Syncfusion](https://github.com/syncfusion)
+-   [CTRL Informatique](https://github.com/CTRL-Informatique)
+
+**Other sponsors are:**
+
+-   [Hassan Rezk Habib (@hassanhabib)](https://github.com/hassanhabib)
+-   [Jonny Larsson (@Garderoben)](https://github.com/Garderoben)
+-   [Domn Werner (@domn1995)](https://github.com/domn1995)
+-   [Mladen Macanović (@stsrki)](https://github.com/stsrki)
+-   [@ChristopheDEBOVE](https://github.com/ChristopheDEBOVE)
+
 ### Added
 
 -   Add `ComponentFactories` extensions method that makes it easy to register an instance of a replacement component. By [@egil](https://github.com/egil).
@@ -65,7 +89,7 @@ Big shout out to **bUnit's sponsors** who helped make this release happen.
 
 **Other sponsors are:**
 
--   [Hassan Rezk Habib (@Garderoben)](https://github.com/hassanhabib)
+-   [Hassan Rezk Habib (@hassanhabib)](https://github.com/hassanhabib)
 -   [Jonny Larsson (@Garderoben)](https://github.com/Garderoben)
 -   [Domn Werner (@domn1995)](https://github.com/domn1995)
 -   [Mladen Macanović (@stsrki)](https://github.com/stsrki)
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -47,7 +47,7 @@
 	<!-- Shared code analyzers used for all projects in the solution -->
 	<ItemGroup Label="Code Analyzers">
 		<PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
-		<PackageReference Include="Meziantou.Analyzer" Version="1.0.694" PrivateAssets="All" />
+		<PackageReference Include="Meziantou.Analyzer" Version="1.0.695" PrivateAssets="All" />
 		<PackageReference Include="SonarAnalyzer.CSharp" Version="8.35.0.42613" PrivateAssets="All" />
 	</ItemGroup>
 
diff --git a/src/bunit.core/Rendering/TestRenderer.cs b/src/bunit.core/Rendering/TestRenderer.cs
@@ -82,12 +82,17 @@ public Task DispatchEventAsync(
 			}
 			catch (ArgumentException ex) when (string.Equals(ex.Message, $"There is no event handler associated with this event. EventId: '{eventHandlerId}'. (Parameter 'eventHandlerId')", StringComparison.Ordinal))
 			{
+				if (ignoreUnknownEventHandlers)
+				{
+					return Task.CompletedTask;
+				}
+
 				var betterExceptionMsg = new UnknownEventHandlerIdException(eventHandlerId, fieldInfo, ex);
 				return Task.FromException(betterExceptionMsg);
 			}
 		});
 
-		if (result.IsFaulted && result.Exception is not null && !(ignoreUnknownEventHandlers && result.Exception.InnerException is UnknownEventHandlerIdException))
+		if (result.IsFaulted && result.Exception is not null)
 		{
 			HandleException(result.Exception);
 		}
diff --git a/src/bunit.web/EventDispatchExtensions/TriggerEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/TriggerEventDispatchExtensions.cs
@@ -11,7 +11,31 @@ namespace Bunit;
 /// </summary>
 public static class TriggerEventDispatchExtensions
 {
-	private static readonly HashSet<string> NonBubblingEvents = new(StringComparer.Ordinal) { "onabort", "onblur", "onchange", "onerror", "onfocus", "onload", "onloadend", "onloadstart", "onmouseenter", "onmouseleave", "onprogress", "onreset", "onscroll", "onsubmit", "onunload", "ontoggle", "ondomnodeinsertedintodocument", "ondomnoderemovedfromdocument" };
+	private static readonly HashSet<string> NonBubblingEvents = new(StringComparer.Ordinal)
+	{
+		"onabort",
+		"onblur",
+		"onchange",
+		"onerror",
+		"onfocus",
+		"onload",
+		"onloadend",
+		"onloadstart",
+		"onmouseenter",
+		"onmouseleave",
+		"onprogress",
+		"onreset",
+		"onscroll",
+		"onsubmit",
+		"onunload",
+		"ontoggle",
+		"ondomnodeinsertedintodocument",
+		"ondomnoderemovedfromdocument",
+		"oninvalid",
+		"onpointerleave",
+		"onpointerenter",
+		"onselectionchange",
+	};
 	private static readonly HashSet<string> DisabledEventNames = new(StringComparer.Ordinal) { "onclick", "ondblclick", "onmousedown", "onmousemove", "onmouseup" };
 
 	/// <summary>
diff --git a/src/bunit.web/bunit.web.csproj b/src/bunit.web/bunit.web.csproj
@@ -16,7 +16,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="AngleSharp" Version="0.16.1" />
-		<PackageReference Include="AngleSharp.Css" Version="0.16.3" />
+		<PackageReference Include="AngleSharp.Css" Version="0.16.4" />
 		<PackageReference Include="AngleSharp.Diffing" Version="0.17.0" />
 		<PackageReference Include="AngleSharp.Wrappers" Version="2.0.0" />
 		<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="All" />
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -15,8 +15,8 @@
 	<ItemGroup Condition="$(MSBuildProjectName) != 'bunit.testassets'">
 		<PackageReference Include="AutoFixture" Version="4.17.0" />
 		<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-		<PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="1.3.0" />
 		<PackageReference Include="Moq" Version="4.16.1" />
 		<PackageReference Include="Shouldly" Version="4.0.3" />
 		<PackageReference Include="xunit" Version="2.4.1" />
diff --git a/tests/bunit.web.tests/BlazorE2E/ComponentRenderingTest.cs b/tests/bunit.web.tests/BlazorE2E/ComponentRenderingTest.cs
@@ -598,4 +598,15 @@ public void CanHandleRemovedParentObjects()
 		cut.WaitForState(() => !cut.FindAll("div").Any());
 		cut.FindAll("div").Count.ShouldBe(0);
 	}
+
+	[Fact]
+	public async Task CanHandleRemovedParentObjectsAsync()
+	{
+		var cut = RenderComponent<DispatcherException>();
+
+		await cut.Find("button").ClickAsync(new MouseEventArgs());
+
+		cut.WaitForState(() => !cut.FindAll("div").Any());
+		cut.FindAll("div").Count.ShouldBe(0);
+	}
 }
diff --git a/tests/bunit.web.tests/EventDispatchExtensions/GeneralEventDispatchExtensionsTest.cs b/tests/bunit.web.tests/EventDispatchExtensions/GeneralEventDispatchExtensionsTest.cs
@@ -94,6 +94,10 @@ public void Test101()
 		[InlineData("ontoggle")]
 		[InlineData("onDOMNodeInsertedIntoDocument")]
 		[InlineData("onDOMNodeRemovedFromDocument")]
+		[InlineData("oninvalid")]
+		[InlineData("onpointerleave")]
+		[InlineData("onpointerenter")]
+		[InlineData("onselectionchange")]
 		public async Task Test110(string eventName)
 		{
 			var cut = RenderComponent<EventBubbles>(ps => ps.Add(p => p.EventName, eventName));
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.5",
+  "version": "1.6",
   "assemblyVersion": {
     "precision": "revision"
   },

Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,17 @@ public Task DispatchEventAsync(`
`82`	`82`	`}`
`83`	`83`	`catch (ArgumentException ex) when (string.Equals(ex.Message, $"There is no event handler associated with this event. EventId: '{eventHandlerId}'. (Parameter 'eventHandlerId')", StringComparison.Ordinal))`
`84`	`84`	`{`
	`85`	`+ if (ignoreUnknownEventHandlers)`
	`86`	`+ {`
	`87`	`+ return Task.CompletedTask;`
	`88`	`+ }`
	`89`	`+`
`85`	`90`	`var betterExceptionMsg = new UnknownEventHandlerIdException(eventHandlerId, fieldInfo, ex);`
`86`	`91`	`return Task.FromException(betterExceptionMsg);`
`87`	`92`	`}`
`88`	`93`	`});`
`89`	`94`
`90`		`- if (result.IsFaulted && result.Exception is not null && !(ignoreUnknownEventHandlers && result.Exception.InnerException is UnknownEventHandlerIdException))`
	`95`	`+ if (result.IsFaulted && result.Exception is not null)`
`91`	`96`	`{`
`92`	`97`	`HandleException(result.Exception);`
`93`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "1.5",`
	`3`	`+ "version": "1.6",`
`4`	`4`	`"assemblyVersion": {`
`5`	`5`	`"precision": "revision"`
`6`	`6`	`},`