From ffd6fa7e931011e6080b1ae70f897013c6e01b8e Mon Sep 17 00:00:00 2001
From: Steven Giesel <stgiesel35@gmail.com>
Date: Sat, 15 Jul 2023 13:26:10 +0200
Subject: [PATCH] chore: Added test for MarkupMatches to render fragment when
 renderer is in use (#1157)

---
 src/bunit.web/Rendering/WebTestRenderer.cs    | 43 +++++++++----------
 .../SampleComponents/LoadingComponent.razor   | 12 ++++++
 .../Asserting/MarkupMatchesTests.razor        | 18 ++++++++
 3 files changed, 51 insertions(+), 22 deletions(-)
 create mode 100644 tests/bunit.testassets/SampleComponents/LoadingComponent.razor
 create mode 100644 tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor

diff --git a/src/bunit.web/Rendering/WebTestRenderer.cs b/src/bunit.web/Rendering/WebTestRenderer.cs
index 2249abf8e..0e710b50a 100644
--- a/src/bunit.web/Rendering/WebTestRenderer.cs
+++ b/src/bunit.web/Rendering/WebTestRenderer.cs
@@ -7,34 +7,33 @@
 using Microsoft.JSInterop;
 #endif
 
-namespace Bunit.Rendering
+namespace Bunit.Rendering;
+
+/// <summary>
+/// Represents a <see cref="ITestRenderer"/> that is used when rendering
+/// Blazor components for the web.
+/// </summary>
+public class WebTestRenderer : TestRenderer
 {
 	/// <summary>
-	/// Represents a <see cref="ITestRenderer"/> that is used when rendering
-	/// Blazor components for the web.
+	/// Initializes a new instance of the <see cref="WebTestRenderer"/> class.
 	/// </summary>
-	public class WebTestRenderer : TestRenderer
+	public WebTestRenderer(IRenderedComponentActivator renderedComponentActivator, TestServiceProvider services, ILoggerFactory loggerFactory)
+		: base(renderedComponentActivator, services, loggerFactory)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="WebTestRenderer"/> class.
-		/// </summary>
-		public WebTestRenderer(IRenderedComponentActivator renderedComponentActivator, TestServiceProvider services, ILoggerFactory loggerFactory)
-			: base(renderedComponentActivator, services, loggerFactory)
-		{
 #if NET5_0_OR_GREATER
-			ElementReferenceContext = new WebElementReferenceContext(services.GetRequiredService<IJSRuntime>());
+		ElementReferenceContext = new WebElementReferenceContext(services.GetRequiredService<IJSRuntime>());
 #endif
-		}
+	}
 
 #if NET5_0_OR_GREATER
-		/// <summary>
-		/// Initializes a new instance of the <see cref="WebTestRenderer"/> class.
-		/// </summary>
-		public WebTestRenderer(IRenderedComponentActivator renderedComponentActivator, TestServiceProvider services, ILoggerFactory loggerFactory, IComponentActivator componentActivator)
-			: base(renderedComponentActivator, services, loggerFactory, componentActivator)
-		{
-			ElementReferenceContext = new WebElementReferenceContext(services.GetRequiredService<IJSRuntime>());
-		}
-#endif
+	/// <summary>
+	/// Initializes a new instance of the <see cref="WebTestRenderer"/> class.
+	/// </summary>
+	public WebTestRenderer(IRenderedComponentActivator renderedComponentActivator, TestServiceProvider services, ILoggerFactory loggerFactory, IComponentActivator componentActivator)
+		: base(renderedComponentActivator, services, loggerFactory, componentActivator)
+	{
+		ElementReferenceContext = new WebElementReferenceContext(services.GetRequiredService<IJSRuntime>());
 	}
-}
+#endif
+}
\ No newline at end of file
diff --git a/tests/bunit.testassets/SampleComponents/LoadingComponent.razor b/tests/bunit.testassets/SampleComponents/LoadingComponent.razor
new file mode 100644
index 000000000..35c9bf469
--- /dev/null
+++ b/tests/bunit.testassets/SampleComponents/LoadingComponent.razor
@@ -0,0 +1,12 @@
+<span>@text</span>
+@code {
+	[Parameter]
+	public Task Task { get; set; }
+
+	private string text = "loading";
+	protected override async Task OnInitializedAsync()
+	{
+		await Task;
+		text = "done";
+	}
+}
diff --git a/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor b/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor
new file mode 100644
index 000000000..3596c1a60
--- /dev/null
+++ b/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor
@@ -0,0 +1,18 @@
+@using Bunit.TestAssets.SampleComponents
+@inherits TestContext
+
+@code {
+	[Fact]
+	public void MarkupMatchesShouldNotBeBlockedByRenderer()
+	{
+		var tcs = new TaskCompletionSource<object?>();
+
+		var cut = Render(@<LoadingComponent Task="@tcs.Task"/> );
+
+		cut.MarkupMatches(@<span>loading</span>);
+
+		tcs.SetResult(true);
+
+		cut.WaitForAssertion(() => cut.MarkupMatches(@<span>done</span>));
+	}
+}