SetCacheEnable and WaitFor test updates (#988)

hardkoded · Mar 7, 2019 · bddf0fc · bddf0fc
1 parent f4f0a2e
commit bddf0fc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/lib/PuppeteerSharp.Tests/FrameTests/WaitForFunctionTests.cs b/lib/PuppeteerSharp.Tests/FrameTests/WaitForFunctionTests.cs
@@ -66,12 +66,12 @@ public async Task ShouldWorkWithStrictCSPPolicy()
         {
             Server.SetCSP("/empty.html", "script-src " + TestConstants.ServerUrl);
             await Page.GoToAsync(TestConstants.EmptyPage);
-            var watchdog = Page.WaitForFunctionAsync("() => window.__FOO === 'hit'", new WaitForFunctionOptions
-            {
-                Polling = WaitForFunctionPollingOption.Raf
-            });
-            await Page.EvaluateExpressionAsync("window.__FOO = 'hit'");
-            await watchdog;
+            await Task.WhenAll(
+                Page.WaitForFunctionAsync("() => window.__FOO === 'hit'", new WaitForFunctionOptions
+                {
+                    Polling = WaitForFunctionPollingOption.Raf
+                }),
+                Page.EvaluateExpressionAsync("window.__FOO = 'hit'"));
         }
 
         [Fact]

diff --git a/lib/PuppeteerSharp.Tests/FrameTests/WaitForSelectorTests.cs b/lib/PuppeteerSharp.Tests/FrameTests/WaitForSelectorTests.cs
@@ -29,7 +29,11 @@ public async Task ShouldWorkWithRemovedMutationObserver()
         {
             await Page.EvaluateExpressionAsync("delete window.MutationObserver");
             var waitForSelector = Page.WaitForSelectorAsync(".zombo");
-            await Page.SetContentAsync("<div class='zombo'>anything</div>");
+
+            await Task.WhenAll(
+                waitForSelector,
+                Page.SetContentAsync("<div class='zombo'>anything</div>"));
+
             Assert.Equal("anything", await Page.EvaluateFunctionAsync<string>("x => x.textContent", await waitForSelector));
         }
 

diff --git a/lib/PuppeteerSharp.Tests/PageTests/SetCacheEnabledTests.cs b/lib/PuppeteerSharp.Tests/PageTests/SetCacheEnabledTests.cs
@@ -19,9 +19,8 @@ public async Task ShouldEnableOrDisableTheCacheBasedOnTheStatePassed()
             var responses = new Dictionary<string, Response>();
             Page.Response += (sender, e) => responses[e.Response.Url.Split('/').Last()] = e.Response;
 
-            await Page.GoToAsync(TestConstants.ServerUrl + "/cached/one-style.html",
-                waitUntil: new[] { WaitUntilNavigation.Networkidle2 });
-            await Page.ReloadAsync(waitUntil: new[] { WaitUntilNavigation.Networkidle2 });
+            await Page.GoToAsync(TestConstants.ServerUrl + "/cached/one-style.html");
+            await Page.ReloadAsync();
             Assert.True(responses["one-style.css"].FromCache);
 
             await Page.SetCacheEnabledAsync(false);