From 80558b6bfb5364c8745639b7e17b6f05d6df8ca8 Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@gmail.com>
Date: Tue, 17 Jul 2018 22:32:38 +0900
Subject: [PATCH] Make 5000 ms default wait

---
 tests/browsertests/common.nim    | 11 ++++-------
 tests/browsertests/scenario1.nim |  4 ++--
 tests/browsertests/threads.nim   |  4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/browsertests/common.nim b/tests/browsertests/common.nim
index 340492c..a2fb09b 100644
--- a/tests/browsertests/common.nim
+++ b/tests/browsertests/common.nim
@@ -66,18 +66,15 @@ proc waitForLoad*(session: Session, timeout=20000) =
     if waitTime > timeout:
       doAssert false, "Wait for load time exceeded"
 
-proc wait*(session: Session) =
-  session.waitForLoad()
-
-proc wait*(session: Session, msTimeout: int) =
+proc wait*(session: Session, msTimeout: int = 5000) =
   session.waitForLoad(msTimeout)
 
 proc logout*(session: Session) =
   with session:
-    wait(5000)
+    wait()
     click "#profile-btn"
     click "#profile-btn #logout-btn"
-    wait(5000)
+    wait()
 
 proc login*(session: Session, user, password: string) =
   with session:
@@ -88,4 +85,4 @@ proc login*(session: Session, user, password: string) =
 
     sendKeys "#login-form input[name='password']", Key.Enter
 
-    wait(5000)
+    wait()
diff --git a/tests/browsertests/scenario1.nim b/tests/browsertests/scenario1.nim
index 89dc76b..f8efe48 100644
--- a/tests/browsertests/scenario1.nim
+++ b/tests/browsertests/scenario1.nim
@@ -26,7 +26,7 @@ proc test*(session: Session, baseUrl: string) =
       sendKeys "#login-form input[name='password']", "admin"
 
       sendKeys "#login-form input[name='password']", Key.Enter
-      wait 5000
+      wait()
 
       # Verify that the user menu has been initialised properly.
       click "#profile-btn"
@@ -46,7 +46,7 @@ proc test*(session: Session, baseUrl: string) =
       sendKeys "#signup-form input[name='password']", "test"
 
       click "#signup-modal .create-account-btn"
-      wait 5000
+      wait()
 
       # Verify that the user menu has been initialised properly.
       click "#profile-btn"
diff --git a/tests/browsertests/threads.nim b/tests/browsertests/threads.nim
index 5181b11..a74d59e 100644
--- a/tests/browsertests/threads.nim
+++ b/tests/browsertests/threads.nim
@@ -80,7 +80,6 @@ proc test*(session: Session, baseUrl: string) =
 
     test "can delete thread":
       with session:
-        wait()
         click titleStr, LinkTextSelector
         wait()
 
@@ -89,10 +88,11 @@ proc test*(session: Session, baseUrl: string) =
 
         # click delete confirmation
         click "#delete-modal .delete-btn"
+        wait()
 
         # Make sure the forum post is gone
         checkIsNone titleStr, LinkTextSelector
 
     session.navigate(baseUrl)
-    waitForLoad(session)
+    session.wait()
     logout(session)