fix Page.RemoveExposedFunctionAsync (#2671)

hardkoded · Jul 3, 2024 · e24aa62 · e24aa62
1 parent 88dc82c
commit e24aa62
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/PuppeteerSharp.Tests/PageTests/RemoveExposedFunctionTests.cs b/lib/PuppeteerSharp.Tests/PageTests/RemoveExposedFunctionTests.cs
@@ -9,12 +9,15 @@ public class RemoveExposeFunctionTests : PuppeteerPageBaseTest
         [Test, Retry(2), PuppeteerTest("page.spec", "Page Page.removeExposedFunction", "should work")]
         public async Task ShouldWork()
         {
-            await Page.ExposeFunctionAsync("compute", (int a, int b) => a * b);
-            var result = await Page.EvaluateFunctionAsync<int>("async () => compute(9, 4)");
-            Assert.AreEqual(36, result);
-
-            await Page.RemoveExposedFunctionAsync("compute");
+            // Run twice to verify function can be added again after remove
+            for (var i = 0; i < 2; i++)
+            {
+                await Page.ExposeFunctionAsync("compute", (int a, int b) => a * b);
+                var result = await Page.EvaluateFunctionAsync<int>("async () => compute(9, 4)");
+                Assert.AreEqual(36, result);
 
+                await Page.RemoveExposedFunctionAsync("compute");
+            }
             Assert.ThrowsAsync<EvaluationFailedException>(() => Page.EvaluateFunctionAsync<int>("async () => compute(9, 4)"));
         }
     }

diff --git a/lib/PuppeteerSharp/Cdp/CdpPage.cs b/lib/PuppeteerSharp/Cdp/CdpPage.cs
@@ -236,7 +236,7 @@ public override async Task RemoveExposedFunctionAsync(string name)
             throw new ArgumentNullException(nameof(name));
         }
 
-        if (!_exposedFunctions.TryRemove(name, out var exposedFun) && !_bindings.TryRemove(name, out _))
+        if (!_exposedFunctions.TryRemove(name, out var exposedFun) || !_bindings.TryRemove(name, out _))
         {
             throw new PuppeteerException(
                 $"Failed to remove page binding with name {name}: window['{name}'] does not exists!");