Undo some changes

hardkoded · Nov 16, 2023 · 71c6603 · 71c6603
1 parent 9d841fa
commit 71c6603
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/lib/PuppeteerSharp.Tests/ElementHandleTests/ClickTests.cs b/lib/PuppeteerSharp.Tests/ElementHandleTests/ClickTests.cs
@@ -32,15 +32,15 @@ public async Task ShouldWorkForShadowDomV1()
             Assert.True(await Page.EvaluateExpressionAsync<bool>("clicked"));
         }
 
-        [PuppeteerTest("elementhandle.spec.ts", "ElementHandle.click", "should work for TextNodes")]
+        [PuppeteerTest("elementhandle.spec.ts", "ElementHandle.click", "should not work for TextNodes")]
         [PuppeteerTimeout]
-        public async Task ShouldWorkForTextNodes()
+        public async Task ShouldNotWorkForTextNodes()
         {
             await Page.GoToAsync(TestConstants.ServerUrl + "/input/button.html");
             var buttonTextNode = (IElementHandle)await Page.EvaluateExpressionHandleAsync(
                 "document.querySelector('button').firstChild");
-            var exception = Assert.ThrowsAsync<PuppeteerException>(async () => await buttonTextNode.ClickAsync());
-            Assert.AreEqual("Node is not of type HTMLElement", exception.Message);
+            var exception = Assert.ThrowsAsync<EvaluationFailedException>(async () => await buttonTextNode.ClickAsync());
+            Assert.That(exception.Message, Does.Contain("is not of type 'Element'"));
         }
 
         [PuppeteerTest("elementhandle.spec.ts", "ElementHandle.click", "should throw for detached nodes")]

diff --git a/lib/PuppeteerSharp/ElementHandle.cs b/lib/PuppeteerSharp/ElementHandle.cs
@@ -694,8 +694,7 @@ await handle.EvaluateFunctionAsync(
                                 behavior: 'instant',
                             });
                         }",
-                        null,
-                        true).ConfigureAwait(false);
+                        null).ConfigureAwait(false);
                 }
 
                 return handle;

diff --git a/lib/PuppeteerSharp/IElementHandle.cs b/lib/PuppeteerSharp/IElementHandle.cs
@@ -123,7 +123,7 @@ public interface IElementHandle : IJSHandle
         /// </summary>
         /// <param name="threshold">A number between 0 and 1 specifying the fraction of the element's area that must be visible to pass the check.</param>
         /// <returns>A task which resolves to true if the element is visible in the current viewport.</returns>
-        Task<bool> IsIntersectingViewportAsync(int threshold = 1);
+        Task<bool> IsIntersectingViewportAsync(int threshold = 0);
 
         /// <summary>
         /// Focuses the element, and then uses <see cref="IKeyboard.DownAsync(string, DownOptions)"/> and <see cref="IKeyboard.UpAsync(string)"/>.

diff --git a/lib/PuppeteerSharp/JSHandle.cs b/lib/PuppeteerSharp/JSHandle.cs
@@ -139,8 +139,14 @@ public Task<IJSHandle> EvaluateFunctionHandleAsync(string pageFunction, params o
         }
 
         /// <inheritdoc/>
-        public Task<JToken> EvaluateFunctionAsync(string script, params object[] args)
-            => EvaluateFunctionAsync(script, args, false);
+        public async Task<JToken> EvaluateFunctionAsync(string script, params object[] args)
+        {
+            var list = new List<object>(args);
+            var adoptedThis = await Realm.AdoptHandleAsync(this).ConfigureAwait(false);
+            list.Insert(0, adoptedThis);
+            return await Realm.EvaluateFunctionAsync<JToken>(script, list.ToArray())
+                .ConfigureAwait(false);
+        }
 
         /// <inheritdoc/>
         public Task<T> EvaluateFunctionAsync<T>(string script, params object[] args)
@@ -149,14 +155,5 @@ public Task<T> EvaluateFunctionAsync<T>(string script, params object[] args)
             list.Insert(0, this);
             return Realm.EvaluateFunctionAsync<T>(script, list.ToArray());
         }
-
-        internal async Task<JToken> EvaluateFunctionAsync(string script, object[] args, bool adopt)
-        {
-            var list = new List<object>(args);
-            var adoptedThis = await Frame.IsolatedRealm.AdoptHandleAsync(this).ConfigureAwait(false);
-            list.Insert(0, adoptedThis);
-            return await Frame.IsolatedRealm.EvaluateFunctionAsync<JToken>(script, list.ToArray())
-                .ConfigureAwait(false);
-        }
     }
 }