refactor: Remove IRefreshableCollection and behavior

Author: linkdotnet

MIGRATION.md

@@ -82,3 +82,26 @@ The `TestServiceProvider` class has been renamed to `BunitTestServiceProvider`.
 
 ## `DisposeComponents` is now asynchronous and called `DisposeComponentsAsync`
 `DisposeComponentsAsync` allows to await `DisposeAsync` of components under test. If you used `DisposeComponents`, you should replace it with `DisposeComponentsAsync`.
+
+## `IRefreshableElementCollection` was removed
+
+The `IRefreshableElementCollection` interface has been removed. With this the `FindAll` method does not accept a `bool enableRefresh` parameter anymore. Code like this:
+
+```csharp
+var items = cut.FindAll("li", enableRefresh: true);
+
+cut.Find("button").Click(); // Some action that causes items to change
+
+Assert.Equal(3, items.Count);
+```
+
+Should be changed to this:
+
+```csharp
+var items = cut.FindAll("li");
+
+cut.Find("button").Click(); // Some action that causes items to change
+
+items = cut.FindAll("li"); // Re-query the items
+Assert.Equal(3, items.Count);
+```

src/bunit/Extensions/IRefreshableElementCollection.cs

@@ -36,13 +36,13 @@ public static IElement Find<TComponent>(this IRenderedComponent<TComponent> rend
 	/// </summary>
 	/// <param name="renderedComponent">The rendered fragment to search.</param>
 	/// <param name="cssSelector">The group of selectors to use.</param>
-	/// <param name="enableAutoRefresh">If true, the returned <see cref="IRefreshableElementCollection{IElement}"/> will automatically refresh its <see cref="IElement"/>s whenever the <paramref name="renderedComponent"/> changes.</param>
-	/// <returns>An <see cref="IRefreshableElementCollection{IElement}"/>, that can be refreshed to execute the search again.</returns>
-	public static IRefreshableElementCollection<IElement> FindAll<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, bool enableAutoRefresh = false)
+	/// <returns>An <see cref="IReadOnlyList{IElement}"/>, that can be refreshed to execute the search again.</returns>
+	public static IReadOnlyList<IElement> FindAll<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector)
 		where TComponent : IComponent
 	{
 		ArgumentNullException.ThrowIfNull(renderedComponent);
-		return new RefreshableElementCollection((IRenderedComponent<IComponent>)renderedComponent, cssSelector) { EnableAutoRefresh = enableAutoRefresh };
+
+		return renderedComponent.Nodes.QuerySelectorAll(cssSelector).ToArray();
 	}
 
 	/// <summary>

src/bunit/Extensions/Internal/RefreshableElementCollection.cs

@@ -40,8 +40,8 @@ public static IElement WaitForElement<TComponent>(this IRenderedComponent<TCompo
 	/// <param name="renderedComponent">The render fragment or component find the matching element in.</param>
 	/// <param name="cssSelector">The CSS selector to use to search for elements.</param>
 	/// <exception cref="WaitForFailedException">Thrown if no elements is found matching the <paramref name="cssSelector"/> within the default timeout.</exception>
-	/// <returns>The <see cref="IRefreshableElementCollection{IElement}"/>.</returns>
-	public static IRefreshableElementCollection<IElement> WaitForElements<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector)
+	/// <returns>The <see cref="IReadOnlyList{IElement}"/>.</returns>
+	public static IReadOnlyList<IElement> WaitForElements<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector)
 		where TComponent : IComponent => WaitForElementsCore(renderedComponent, cssSelector, matchElementCount: null, timeout: null);
 
 	/// <summary>
@@ -52,8 +52,8 @@ public static IRefreshableElementCollection<IElement> WaitForElements<TComponent
 	/// <param name="cssSelector">The CSS selector to use to search for elements.</param>
 	/// <param name="matchElementCount">The exact number of elements to that the <paramref name="cssSelector"/> should match.</param>
 	/// <exception cref="WaitForFailedException">Thrown if no elements is found matching the <paramref name="cssSelector"/> within the default timeout.</exception>
-	/// <returns>The <see cref="IRefreshableElementCollection{IElement}"/>.</returns>
-	public static IRefreshableElementCollection<IElement> WaitForElements<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, int matchElementCount)
+	/// <returns>The <see cref="IReadOnlyList{IElement}"/>.</returns>
+	public static IReadOnlyList<IElement> WaitForElements<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, int matchElementCount)
 		where TComponent : IComponent => WaitForElementsCore(renderedComponent, cssSelector, matchElementCount: matchElementCount, timeout: null);
 
 	/// <summary>
@@ -64,8 +64,8 @@ public static IRefreshableElementCollection<IElement> WaitForElements<TComponent
 	/// <param name="cssSelector">The CSS selector to use to search for elements.</param>
 	/// <param name="timeout">The maximum time to wait for elements to appear.</param>
 	/// <exception cref="WaitForFailedException">Thrown if no elements is found matching the <paramref name="cssSelector"/> within the default timeout.</exception>
-	/// <returns>The <see cref="IRefreshableElementCollection{IElement}"/>.</returns>
-	public static IRefreshableElementCollection<IElement> WaitForElements<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, TimeSpan timeout)
+	/// <returns>The <see cref="IReadOnlyList{IElement}"/>.</returns>
+	public static IReadOnlyList<IElement> WaitForElements<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, TimeSpan timeout)
 		where TComponent : IComponent
 		=> WaitForElementsCore(renderedComponent, cssSelector, matchElementCount: null, timeout: timeout);
 
@@ -78,8 +78,8 @@ public static IRefreshableElementCollection<IElement> WaitForElements<TComponent
 	/// <param name="matchElementCount">The exact number of elements to that the <paramref name="cssSelector"/> should match.</param>
 	/// <param name="timeout">The maximum time to wait for elements to appear.</param>
 	/// <exception cref="WaitForFailedException">Thrown if no elements is found matching the <paramref name="cssSelector"/> within the default timeout.</exception>
-	/// <returns>The <see cref="IRefreshableElementCollection{IElement}"/>.</returns>
-	public static IRefreshableElementCollection<IElement> WaitForElements<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, int matchElementCount, TimeSpan timeout)
+	/// <returns>The <see cref="IReadOnlyList{IElement}"/>.</returns>
+	public static IReadOnlyList<IElement> WaitForElements<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, int matchElementCount, TimeSpan timeout)
 		where TComponent : IComponent
 		=> WaitForElementsCore(renderedComponent, cssSelector, matchElementCount: matchElementCount, timeout: timeout);
 
@@ -115,8 +115,8 @@ internal static Task<IElement> WaitForElementAsync<TComponent>(this IRenderedCom
 	/// <param name="cssSelector">The CSS selector to use to search for elements.</param>
 	/// <param name="matchElementCount">The exact number of elements to that the <paramref name="cssSelector"/> should match.</param>
 	/// <exception cref="WaitForFailedException">Thrown if no elements is found matching the <paramref name="cssSelector"/> within the default timeout.</exception>
-	/// <returns>The <see cref="IRefreshableElementCollection{IElement}"/>.</returns>
-	internal static Task<IRefreshableElementCollection<IElement>> WaitForElementsAsync<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, int matchElementCount)
+	/// <returns>The <see cref="IReadOnlyList{IElement}"/>.</returns>
+	internal static Task<IReadOnlyList<IElement>> WaitForElementsAsync<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, int matchElementCount)
 		where TComponent : IComponent
 		=> WaitForElementsCoreAsync(renderedComponent, cssSelector, matchElementCount: matchElementCount, timeout: null);
 
@@ -128,8 +128,8 @@ internal static Task<IRefreshableElementCollection<IElement>> WaitForElementsAsy
 	/// <param name="cssSelector">The CSS selector to use to search for elements.</param>
 	/// <param name="timeout">The maximum time to wait for elements to appear.</param>
 	/// <exception cref="WaitForFailedException">Thrown if no elements is found matching the <paramref name="cssSelector"/> within the default timeout.</exception>
-	/// <returns>The <see cref="IRefreshableElementCollection{IElement}"/>.</returns>
-	internal static Task<IRefreshableElementCollection<IElement>> WaitForElementsAsync<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, TimeSpan timeout)
+	/// <returns>The <see cref="IReadOnlyList{IElement}"/>.</returns>
+	internal static Task<IReadOnlyList<IElement>> WaitForElementsAsync<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, TimeSpan timeout)
 		where TComponent : IComponent
 		=> WaitForElementsCoreAsync(renderedComponent, cssSelector, matchElementCount: null, timeout: timeout);
 
@@ -142,8 +142,8 @@ internal static Task<IRefreshableElementCollection<IElement>> WaitForElementsAsy
 	/// <param name="matchElementCount">The exact number of elements to that the <paramref name="cssSelector"/> should match.</param>
 	/// <param name="timeout">The maximum time to wait for elements to appear.</param>
 	/// <exception cref="WaitForFailedException">Thrown if no elements is found matching the <paramref name="cssSelector"/> within the default timeout.</exception>
-	/// <returns>The <see cref="IRefreshableElementCollection{IElement}"/>.</returns>
-	internal static Task<IRefreshableElementCollection<IElement>> WaitForElementsAsync<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, int matchElementCount, TimeSpan timeout)
+	/// <returns>The <see cref="IReadOnlyList{IElement}"/>.</returns>
+	internal static Task<IReadOnlyList<IElement>> WaitForElementsAsync<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector, int matchElementCount, TimeSpan timeout)
 		where TComponent : IComponent
 		=> WaitForElementsCoreAsync(renderedComponent, cssSelector, matchElementCount: matchElementCount, timeout: timeout);
 
@@ -154,8 +154,8 @@ internal static Task<IRefreshableElementCollection<IElement>> WaitForElementsAsy
 	/// <param name="renderedComponent">The render fragment or component find the matching element in.</param>
 	/// <param name="cssSelector">The CSS selector to use to search for elements.</param>
 	/// <exception cref="WaitForFailedException">Thrown if no elements is found matching the <paramref name="cssSelector"/> within the default timeout.</exception>
-	/// <returns>The <see cref="IRefreshableElementCollection{IElement}"/>.</returns>
-	internal static Task<IRefreshableElementCollection<IElement>> WaitForElementsAsync<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector)
+	/// <returns>The <see cref="IReadOnlyList{IElement}"/>.</returns>
+	internal static Task<IReadOnlyList<IElement>> WaitForElementsAsync<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector)
 		where TComponent : IComponent
 		=> WaitForElementsCoreAsync<TComponent>(renderedComponent, cssSelector, matchElementCount: null, timeout: null);
 
@@ -185,7 +185,7 @@ private static async Task<IElement> WaitForElementCoreAsync<TComponent>(this IRe
 		return await waiter.WaitTask;
 	}
 
-	private static IRefreshableElementCollection<IElement> WaitForElementsCore<TComponent>(
+	private static IReadOnlyList<IElement> WaitForElementsCore<TComponent>(
 		this IRenderedComponent<TComponent> renderedComponent,
 		string cssSelector,
 		int? matchElementCount,
@@ -207,7 +207,7 @@ private static IRefreshableElementCollection<IElement> WaitForElementsCore<TComp
 		}
 	}
 
-	private static async Task<IRefreshableElementCollection<IElement>> WaitForElementsCoreAsync<TComponent>(
+	private static async Task<IReadOnlyList<IElement>> WaitForElementsCoreAsync<TComponent>(
 		this IRenderedComponent<TComponent> renderedComponent,
 		string cssSelector,
 		int? matchElementCount,

src/bunit/Extensions/RenderedComponentExtensions.cs

@@ -7,7 +7,7 @@ namespace Bunit.Extensions.WaitForHelpers;
 /// <summary>
 /// Represents an async wait helper, that will wait for a specified time for element(s) to become available in the DOM.
 /// </summary>
-internal class WaitForElementsHelper<TComponent> : WaitForHelper<IRefreshableElementCollection<IElement>, TComponent>
+internal class WaitForElementsHelper<TComponent> : WaitForHelper<IReadOnlyList<IElement>, TComponent>
 	where TComponent : IComponent
 {
 	internal const string TimeoutBeforeFoundMessage = "The CSS selector did not result in any matching element(s) before the timeout period passed.";

src/bunit/Extensions/WaitForHelpers/RenderedComponentWaitForHelperExtensions.WaitForElement.cs

@@ -106,15 +106,17 @@ public void CanTriggerKeyPressEvents()
 		// List is initially empty
 		var cut = Render<KeyPressEventComponent>();
 		var inputElement = cut.Find("input");
-		var liElements = cut.FindAll("li", enableAutoRefresh: true);
+		var liElements = cut.FindAll("li");
 		liElements.ShouldBeEmpty();
 
 		// Typing adds element
 		inputElement.KeyPress("a");
+		liElements = cut.FindAll("li");
 		liElements.ShouldAllBe(li => Assert.Equal("a", li.TextContent));
 
 		// Typing again adds another element
 		inputElement.KeyPress("b");
+		liElements = cut.FindAll("li");
 		liElements.ShouldAllBe(
 			li => Assert.Equal("a", li.TextContent),
 			li => Assert.Equal("b", li.TextContent));
@@ -285,7 +287,7 @@ public void CanRenderFragmentsWhilePreservingSurroundingElements()
 		var cut = Render<RenderFragmentToggler>();
 		var originalButton = cut.Find("button");
 
-		var fragmentElements = cut.FindAll("p[name=fragment-element]", enableAutoRefresh: true);
+		var fragmentElements = cut.FindAll("p[name=fragment-element]");
 		Assert.Empty(fragmentElements);
 
 		// The JS-side DOM builder handles regions correctly, placing elements
@@ -294,10 +296,12 @@ public void CanRenderFragmentsWhilePreservingSurroundingElements()
 
 		// When we click the button, the region is shown
 		originalButton.Click();
+		fragmentElements = cut.FindAll("p[name=fragment-element]");
 		fragmentElements.Single().ShouldNotBeNull();
 
 		// The button itself was preserved, so we can click it again and see the effect
 		originalButton.Click();
+		fragmentElements = cut.FindAll("p[name=fragment-element]");
 		Assert.Empty(fragmentElements);
 	}
 
@@ -516,11 +520,12 @@ public void CanRenderMultipleChildContent()
 			e => Assert.Equal("Col2", e.TextContent),
 			e => Assert.Equal("Col3", e.TextContent));
 
-		var tfootElements = cut.FindAll("table tfoot td", enableAutoRefresh: true);
+		var tfootElements = cut.FindAll("table tfoot td");
 		Assert.Empty(tfootElements);
 		var toggle = cut.Find("#toggle");
 		toggle.Change(true);
 
+		tfootElements = cut.FindAll("table tfoot td");
 		Assert.Collection(
 			tfootElements,
 			e => Assert.Equal("The", e.TextContent),