Fixes the timeout on driver.Get

florentbr · florentbr · commit bd84f2806bca · 2016-03-02T21:42:47.000+01:00
diff --git a/Selenium/Common/SearchContext.cs b/Selenium/Common/SearchContext.cs
@@ -41,7 +41,7 @@ public void WaitNotElement(By by, int timeout = -1) {
         /// </summary>
         /// <param name="strategy">The mechanism by which to find the elements.</param>
         /// <param name="value">The value to use to search for the elements.</param>
-        /// <param name="timeout"></param>
+        /// <param name="timeout">Optional timeout in milliseconds</param>
         /// <param name="raise"></param>
         /// <returns>WebElement</returns>
         public WebElement FindElementBy(Strategy strategy, string value, int timeout = -1, bool raise = true) {
diff --git a/Selenium/Common/Timeouts.cs b/Selenium/Common/Timeouts.cs
@@ -9,7 +9,7 @@ namespace Selenium {
     /// </summary>
     /// <example>
     /// Sets the implicit timout to 1 second
-    /// <code lang="vbs">	
+    /// <code lang="vb">
     /// driver.Timeouts.ImplicitWait = 1000
     /// </code>
     /// </example>
@@ -19,10 +19,25 @@ namespace Selenium {
     [ComVisible(true), ClassInterface(ClassInterfaceType.None)]
     public class Timeouts : ComInterfaces._Timeouts {
 
-        internal int timeout_implicitwait = 3000;
-        internal int timeout_pageload = -1;
-        internal int timeout_script = -1;
-        internal int timeout_server = 60000;
+        private static void SendTimeoutScript(RemoteSession session, int timeout) {
+            session.Send(RequestMethod.POST, "/timeouts", "type", "script", "ms", timeout);
+        }
+
+        private static void SendTimeoutPageLoad(RemoteSession session, int timeout) {
+            session.Send(RequestMethod.POST, "/timeouts", "type", "page load", "ms", timeout);
+        }
+
+        private static void SendTimeoutImplicit(RemoteSession session, int timeout) {
+            session.Send(RequestMethod.POST, "/timeouts", "type", "implicit", "ms", timeout);
+        }
+
+
+        private RemoteSession _session;
+
+        internal int timeout_server = 90000;       // 90 seconds
+        internal int timeout_pageload = 60000;     // 60 seconds
+        internal int timeout_implicitwait = 3000;  // 3  seconds
+        internal int timeout_script = 15000;       // 15 seconds
 
         /// <summary>
         /// Amount of time that Selenium will wait for waiting commands to complete
@@ -32,6 +47,7 @@ public int ImplicitWait {
                 return timeout_implicitwait;
             }
             set {
+                if (value == timeout_implicitwait) return;
                 timeout_implicitwait = value;
             }
         }
@@ -44,18 +60,24 @@ public int PageLoad {
                 return timeout_pageload;
             }
             set {
+                if (value == timeout_pageload) return;
+                if (_session != null)
+                    SendTimeoutPageLoad(_session, value);
                 timeout_pageload = value;
             }
         }
 
         /// <summary>
-        /// Amount of time the driver should wait while executing a script before throwing an exception.
+        /// Amount of time the driver should wait while executing an asynchronous script before throwing an error.
         /// </summary>
         public int Script {
             get {
                 return timeout_script;
             }
             set {
+                if (value == timeout_script) return;
+                if (_session != null)
+                    SendTimeoutScript(_session, value);
                 timeout_script = value;
             }
         }
@@ -68,10 +90,17 @@ public int Server {
                 return timeout_server;
             }
             set {
+                if (value == timeout_server) return;
                 timeout_server = value;
             }
         }
 
+        internal void SetSession(RemoteSession session) {
+            _session = session;
+            SendTimeoutPageLoad(_session, timeout_pageload);
+            SendTimeoutScript(_session, timeout_pageload);
+        }
+
     }
 
 }
diff --git a/Selenium/Core/RemoteSession.cs b/Selenium/Core/RemoteSession.cs
@@ -59,11 +59,7 @@ public void Start(Dictionary desired_capabilities, Dictionary requiredCapabiliti
                 throw new DeserializeException(typeof(RemoteSession), ex);
             }
 
-            if (this.timeouts.PageLoad != -1)
-                Send(RequestMethod.POST, "/timeouts", "type", "page load", "ms", this.timeouts.PageLoad);
-
-            if (this.timeouts.Script != -1)
-                Send(RequestMethod.POST, "/timeouts", "type", "script", "ms", this.timeouts.Script);
+            this.timeouts.SetSession(this);
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,7 @@ public void Start(Dictionary desired_capabilities, Dictionary requiredCapabiliti`
`59`	`59`	`throw new DeserializeException(typeof(RemoteSession), ex);`
`60`	`60`	`}`
`61`	`61`
`62`		`- if (this.timeouts.PageLoad != -1)`
`63`		`- Send(RequestMethod.POST, "/timeouts", "type", "page load", "ms", this.timeouts.PageLoad);`
`64`		`-`
`65`		`- if (this.timeouts.Script != -1)`
`66`		`- Send(RequestMethod.POST, "/timeouts", "type", "script", "ms", this.timeouts.Script);`
	`62`	`+ this.timeouts.SetSession(this);`
`67`	`63`	`}`
`68`	`64`
`69`	`65`	`/// <summary>`