Fix WaitFor Timeout defaults (#1300)

* Fix WaitForOptions.Timeout type and default * Fix on WaitForSelectorOptions
hardkoded · Oct 8, 2019 · 666f07c · 666f07c
1 parent b901c22
commit 666f07c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/lib/PuppeteerSharp/DOMWorld.cs b/lib/PuppeteerSharp/DOMWorld.cs
@@ -145,12 +145,14 @@ internal async Task SetContentAsync(string html, NavigationOptions options = nul
                 document.close();
             }", html).ConfigureAwait(false);
 
-            var watcher = new LifecycleWatcher(_frameManager, Frame, waitUntil, timeout);
-            var watcherTask = await Task.WhenAny(
-                watcher.TimeoutOrTerminationTask,
-                watcher.LifecycleTask).ConfigureAwait(false);
+            using (var watcher = new LifecycleWatcher(_frameManager, Frame, waitUntil, timeout))
+            {
+                var watcherTask = await Task.WhenAny(
+                    watcher.TimeoutOrTerminationTask,
+                    watcher.LifecycleTask).ConfigureAwait(false);
 
-            await watcherTask.ConfigureAwait(false);
+                await watcherTask.ConfigureAwait(false);
+            }
         }
 
         internal async Task<ElementHandle> AddScriptTagAsync(AddTagOptions options)
@@ -384,6 +386,8 @@ private async Task<ElementHandle> GetDocument()
         private async Task<ElementHandle> WaitForSelectorOrXPathAsync(string selectorOrXPath, bool isXPath, WaitForSelectorOptions options = null)
         {
             options = options ?? new WaitForSelectorOptions();
+            var timeout = options.Timeout ?? _timeoutSettings.Timeout;
+
             const string predicate = @"
               function predicate(selectorOrXPath, isXPath, waitForVisible, waitForHidden) {
                 const node = isXPath
@@ -413,7 +417,7 @@ private async Task<ElementHandle> WaitForSelectorOrXPathAsync(string selectorOrX
                 $"{(isXPath ? "XPath" : "selector")} '{selectorOrXPath}'{(options.Hidden ? " to be hidden" : "")}",
                 polling,
                 null,
-                options.Timeout,
+                timeout,
                 new object[]
                 {
                     selectorOrXPath,

diff --git a/lib/PuppeteerSharp/WaitForOptions.cs b/lib/PuppeteerSharp/WaitForOptions.cs
@@ -12,9 +12,9 @@ namespace PuppeteerSharp
     public class WaitForOptions
     {
         /// <summary>
-        /// Maximum time to wait for in milliseconds. Defaults to 30000 (30 seconds). Pass 0 to disable timeout.
+        /// Maximum time to wait for in milliseconds. Pass 0 to disable timeout.
         /// The default value can be changed by setting the <see cref="Page.DefaultTimeout"/> property.
         /// </summary>
-        public int Timeout { get; set; } = Puppeteer.DefaultTimeout;
+        public int? Timeout { get; set; }
     }
 }
diff --git a/lib/PuppeteerSharp/WaitForSelectorOptions.cs b/lib/PuppeteerSharp/WaitForSelectorOptions.cs
@@ -8,9 +8,9 @@
     public class WaitForSelectorOptions
     {
         /// <summary>
-        /// Maximum time to wait for in milliseconds. Defaults to 30000 (30 seconds). Pass 0 to disable timeout.
+        /// Maximum time to wait for in milliseconds. Pass 0 to disable timeout.
         /// </summary>
-        public int Timeout { get; set; } = Puppeteer.DefaultTimeout;
+        public int? Timeout { get; set; }
 
         /// <summary>
         /// Wait for selector to become visible.