Implement ElementHandle.QuerySelectorAll (a.k.a $$) (#219)

Meir017 · kblok · commit 3e9669b0b75b · 2018-05-11T08:34:35.000-03:00
diff --git a/lib/PuppeteerSharp.Tests/ElementHandleTests/QuerySelectorAllTests.cs b/lib/PuppeteerSharp.Tests/ElementHandleTests/QuerySelectorAllTests.cs
@@ -0,0 +1,30 @@
+﻿using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace PuppeteerSharp.Tests.ElementHandleTests
+{
+    [Collection("PuppeteerLoaderFixture collection")]
+    public class QuerySelectorAllTests : PuppeteerPageBaseTest
+    {
+        [Fact]
+        public async Task ShouldQueryExistingElements()
+        {
+            await Page.SetContentAsync("<html><body><div>A</div><br/><div>B</div></body></html>");
+            var html = await Page.QuerySelectorAsync("html");
+            var elements = await html.QuerySelectorAllAsync("div");
+            Assert.Equal(2, elements.Length);
+            var tasks = elements.Select(element => Page.EvaluateFunctionAsync<string>("e => e.textContent", element));
+            Assert.Equal(new[] { "A", "B" }, await Task.WhenAll(tasks));
+        }
+
+        [Fact]
+        public async Task ShouldReturnEmptyArrayForNonExistingElements()
+        {
+            await Page.SetContentAsync("<html><body><span>A</span><br/><span>B</span></body></html>");
+            var html = await Page.QuerySelectorAsync("html");
+            var elements = await html.QuerySelectorAllAsync("div");
+            Assert.Empty(elements);
+        }
+    }
+}
diff --git a/lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj b/lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj
@@ -13,7 +13,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Issues\" />
-    <Folder Include="ElementHandleTests\" />
   </ItemGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net471'">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
diff --git a/lib/PuppeteerSharp/ElementHandle.cs b/lib/PuppeteerSharp/ElementHandle.cs
@@ -197,7 +197,12 @@ public async Task<ElementHandle> QuerySelectorAsync(string selector)
             return null;
         }
 
-        internal async Task<ElementHandle[]> QuerySelectorAllAsync(string selector)
+        /// <summary>
+        /// Runs <c>element.querySelectorAll</c> within the page. If no elements match the selector, the return value resolve to <see cref="Array.Empty{T}"/>.
+        /// </summary>
+        /// <param name="selector">A selector to query element for</param>
+        /// <returns>Task which resolves to ElementHandles pointing to the frame elements</returns>
+        public async Task<ElementHandle[]> QuerySelectorAllAsync(string selector)
         {
             var arrayHandle = await ExecutionContext.EvaluateFunctionHandleAsync(
                 "(element, selector) => element.querySelectorAll(selector)",

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,12 @@ public async Task<ElementHandle> QuerySelectorAsync(string selector)`
`197`	`197`	`return null;`
`198`	`198`	`}`
`199`	`199`
`200`		`- internal async Task<ElementHandle[]> QuerySelectorAllAsync(string selector)`
	`200`	`+ /// <summary>`
	`201`	`+ /// Runs <c>element.querySelectorAll</c> within the page. If no elements match the selector, the return value resolve to <see cref="Array.Empty{T}"/>.`
	`202`	`+ /// </summary>`
	`203`	`+ /// <param name="selector">A selector to query element for</param>`
	`204`	`+ /// <returns>Task which resolves to ElementHandles pointing to the frame elements</returns>`
	`205`	`+ public async Task<ElementHandle[]> QuerySelectorAllAsync(string selector)`
`201`	`206`	`{`
`202`	`207`	`var arrayHandle = await ExecutionContext.EvaluateFunctionHandleAsync(`
`203`	`208`	`"(element, selector) => element.querySelectorAll(selector)",`