Merge pull request #957 from bUnit-dev/release/v1.14

egil · web-flow · commit 7843cbfb0a80 · 2023-01-11T20:33:15.000Z
Release of new minor version v1.14
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,15 @@ All notable changes to **bUnit** will be documented in this file. The project ad
 
 ## [Unreleased]
 
+### Added
+
+- Added `IMemoryCache` by default to the Services container. By [@linkdotnet](https://github.com/linkdotnet).
+
+### Fixed
+
+-   Added support in `FakeNavigationManager` to handle umlauts.
+-   Fixed a bug where attribute values did not get escaped. Reported by [@brettwinters](https://github.com/brettwinters). Fixed by [@linkdotnet](https://github.com/linkdotnet).
+
 ## [1.13.5] - 2022-12-16
 
 This release contains a bunch of small tweaks and fixes.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -48,7 +48,7 @@
 	<!-- Shared code analyzers used for all projects in the solution -->
 	<ItemGroup Label="Code Analyzers">
 		<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
-		<PackageReference Include="SonarAnalyzer.CSharp" Version="8.50.0.58025" PrivateAssets="All" />
+		<PackageReference Include="SonarAnalyzer.CSharp" Version="8.51.0.59060" PrivateAssets="All" />
 	</ItemGroup>
 
 	<ItemGroup Label="Implicit usings"
diff --git a/README.md b/README.md
@@ -44,10 +44,10 @@ A huge thank you to the [sponsors of my work with bUnit](https://github.com/spon
 <table border="0">
 	<tr>
 		<td align="center" width="120">
-			<a href="https://github.com/telerik">
-				<img src="https://avatars.githubusercontent.com/u/568561?s=200&v=4" alt="@Telerik" class="avatar" width="72" height="72" />
+			<a href="https://github.com/Progress-Telerik">
+				<img src="https://avatars.githubusercontent.com/u/57092419?s=460" alt="@Progress-Telerik" class="avatar" width="72" height="72" />
 				<br />
-				Telerik
+				Progress Telerik
 			</a>
 		</td>
 		<td align="center" width="120">
@@ -56,7 +56,14 @@ A huge thank you to the [sponsors of my work with bUnit](https://github.com/spon
 				<br />
 				Syncfusion
 			</a>
-		</td>		
+		</td>
+		<td align="center" width="120">
+			<a href="https://github.com/aws">
+				<img class="avatar" src="https://avatars.githubusercontent.com/u/2232217?s=200&v=4" width="72" height="72" alt="@aws" />
+				<br />
+				Amazon Web Services
+			</a>
+		</td>			
 		<td align="center" width="120">
 			<a href="https://github.com/hassanhabib">
 				<img src="https://avatars.githubusercontent.com/u/1453985?s=460" alt="Hassan Rezk Habib (@hassanhabib)" width="72" height="72" class="avatar" />
diff --git a/benchmark/bunit.benchmarks/bunit.benchmarks.csproj b/benchmark/bunit.benchmarks/bunit.benchmarks.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.13.3" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/bunit.web/Extensions/TestServiceProviderExtensions.cs b/src/bunit.web/Extensions/TestServiceProviderExtensions.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Localization;
 
 namespace Bunit.Extensions;
@@ -54,6 +55,8 @@ public static IServiceCollection AddDefaultTestContextServices(this IServiceColl
 		services.AddSingleton<BunitHtmlParser>();
 		services.AddSingleton<IRenderedComponentActivator, RenderedComponentActivator>();
 
+		services.AddMemoryCache();
+
 #if NET6_0_OR_GREATER
 		services.AddSingleton<IErrorBoundaryLogger, BunitErrorBoundaryLogger>();
 #endif
diff --git a/src/bunit.web/Rendering/Internal/Htmlizer.cs b/src/bunit.web/Rendering/Internal/Htmlizer.cs
@@ -6,6 +6,7 @@
 using System.Globalization;
 using System.Text;
 using System.Text.Encodings.Web;
+using System.Text.Unicode;
 using Bunit.Rendering;
 
 namespace Bunit;
@@ -270,7 +271,7 @@ private static int RenderAttributes(
 					result.Append(frame.AttributeName);
 					result.Append('=');
 					result.Append('"');
-					result.Append(value);
+					result.Append(Escape(value));
 					result.Append('"');
 					break;
 				default:
@@ -281,6 +282,11 @@ private static int RenderAttributes(
 		return position + maxElements;
 	}
 
+	private static string Escape(string value) =>
+		value
+			.Replace("&", "&amp;", StringComparison.OrdinalIgnoreCase)
+			.Replace("\"", "&quot;", StringComparison.OrdinalIgnoreCase);
+
 	private sealed class HtmlRenderingContext
 	{
 		private readonly RenderTreeFrameDictionary frames;
diff --git a/src/bunit.web/TestDoubles/NavigationManager/FakeNavigationManager.cs b/src/bunit.web/TestDoubles/NavigationManager/FakeNavigationManager.cs
@@ -142,9 +142,8 @@ protected override void HandleLocationChangingHandlerException(Exception ex, Loc
 #endif
 
 	private URI GetNewAbsoluteUri(string uri)
-		=> URI.IsWellFormedUriString(uri, UriKind.Relative)
-			? ToAbsoluteUri(uri)
-			: new URI(uri, UriKind.Absolute);
+		=> new URI(uri, UriKind.RelativeOrAbsolute).IsAbsoluteUri
+			? new URI(uri, UriKind.RelativeOrAbsolute) : ToAbsoluteUri(uri);
 
 	private bool HasDifferentBaseUri(URI absoluteUri)
 		=> URI.Compare(
diff --git a/src/bunit.web/bunit.web.csproj b/src/bunit.web/bunit.web.csproj
@@ -24,6 +24,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(DotNet3Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet3Version)" />
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(DotNet3Version)" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(DotNet3Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
 	</ItemGroup>
@@ -32,13 +33,15 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(DotNet5Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet5Version)" />
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(DotNet5Version)" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(DotNet5Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(DotNet5Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(DotNet5Version)" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
 		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(DotNet6Version)" />
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(DotNet6Version)" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(DotNet6Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet6Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(DotNet6Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(DotNet6Version)" />
@@ -47,6 +50,7 @@
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(DotNet7Version)" />
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(DotNet7Version)" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(DotNet7Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet7Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(DotNet7Version)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(DotNet7Version)" />
@@ -82,4 +86,4 @@
 		<Using Include="Microsoft.JSInterop" />
 	</ItemGroup>
 
-</Project>
+</Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -16,8 +16,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.4.0" />
-    <PackageReference Include="Moq" Version="4.18.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Moq" Version="4.18.4" />
 		<PackageReference Include="Shouldly" Version="4.1.0" />
 		<PackageReference Include="xunit" Version="2.4.2" />
 		<PackageReference Include="Xunit.Combinatorial" Version="1.5.25" />
diff --git a/tests/bunit.testassets/BlazorE2E/ComponentWithEscapableCharacters.razor b/tests/bunit.testassets/BlazorE2E/ComponentWithEscapableCharacters.razor
@@ -1,5 +1,8 @@
 <p style="@Escaped">@Escaped</p>
 
 @code {
-	private string Escaped => "url('')";
+
+	[Parameter]
+	public string Escaped { get; set; }
+
 }
diff --git a/tests/bunit.web.tests/BlazorE2E/ComponentRenderingTest.cs b/tests/bunit.web.tests/BlazorE2E/ComponentRenderingTest.cs
@@ -691,11 +691,13 @@ public async Task CanHandleRemovedParentObjectsAsync()
 	}
 
 	[Fact]
-	public void EscapableCharactersDontGetEncoded()
+	public void SomeEscapableCharactersDontGetEncoded()
 	{
-		var cut = RenderComponent<ComponentWithEscapableCharacters>();
+		const string input = "url('\"&')";
+		var cut = RenderComponent<ComponentWithEscapableCharacters>(
+			p => p.Add(s => s.Escaped, input));
 
-		cut.Markup.ShouldBe("<p style=\"url('')\">url('')</p>");
+		cut.Markup.ShouldBe("<p style=\"url('&quot;&amp;')\">url('\"&')</p>");
 	}
 
 	[Fact]
diff --git a/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs b/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs
@@ -33,6 +33,8 @@ public void Test002()
 	[InlineData("")]
 	[InlineData("/")]
 	[InlineData("/foo")]
+	[InlineData("/#Storstädning")]
+	[InlineData("/#åäö")]
 	public void Test003(string uri)
 	{
 		var sut = CreateFakeNavigationManager();
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.13",
+  "version": "1.14",
   "assemblyVersion": {
     "precision": "revision"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`<p style="@Escaped">@Escaped</p>`
`2`	`2`
`3`	`3`	`@code {`
`4`		`- private string Escaped => "url('')";`
	`4`	`+`
	`5`	`+ [Parameter]`
	`6`	`+ public string Escaped { get; set; }`
	`7`	`+`
`5`	`8`	`}`