Merge pull request #187 from jyapayne/fix_tests

Fix tests

nimforum.nimble

@@ -21,7 +21,7 @@ requires "sass#649e0701fa5c"
 
 requires "karax#d8df257dd"
 
-requires "webdriver#a2be578"
+requires "webdriver#20f3c1b"
 
 # Tasks
 

src/frontend/profile.nim

@@ -119,7 +119,7 @@ when defined(js):
                  ),
                  onClick=(e: Event, n: VNode) => (state.currentTab = Overview)
                 ):
-                a(class="c-hand"):
+                a(id="overview-tab", class="c-hand"):
                   text "Overview"
               li(class=class(
                   {"active": state.currentTab == Settings},
@@ -127,7 +127,7 @@ when defined(js):
                  ),
                  onClick=(e: Event, n: VNode) => (state.currentTab = Settings)
                 ):
-                a(class="c-hand"):
+                a(id="settings-tab", class="c-hand"):
                   italic(class="fas fa-cog")
                   text " Settings"
 
@@ -147,4 +147,4 @@ when defined(js):
                     genPostLink(thread)
         of Settings:
           if state.settings.isSome():
-            render(state.settings.get(), currentUser)
+            render(state.settings.get(), currentUser)

src/frontend/profilesettings.nim

@@ -165,7 +165,8 @@ when defined(js):
                 label(class="form-label"):
                   text "Account"
               tdiv(class="col-9 col-sm-12"):
-                button(class="btn btn-secondary", `type`="button",
+                button(id="delete-account-btn",
+                       class="btn btn-secondary", `type`="button",
                        onClick=(e: Event, n: VNode) =>
                        (state.deleteModal.show(state.profile.user))):
                   italic(class="fas fa-times")
@@ -176,13 +177,15 @@ when defined(js):
               span(class="text-error"):
                 text state.error.get().message
 
-            button(class=class(
+            button(id="cancel-btn",
+                   class=class(
                     {"disabled": not needsSave(state)}, "btn btn-link"
                    ),
                    onClick=(e: Event, n: VNode) => (resetSettings(state))):
               text "Cancel"
 
-            button(class=class(
+            button(id="save-btn",
+                   class=class(
                     {"disabled": not needsSave(state)}, "btn btn-primary"
                    ),
                    onClick=(e: Event, n: VNode) => save(state),
@@ -199,4 +202,4 @@ when defined(js):
       rankField.setInputText($state.rank)
     let emailField = getVNodeById("email-field")
     if not emailField.isNil:
-      emailField.setInputText($state.email)
+      emailField.setInputText($state.email)

tests/browsertester.nim

@@ -64,8 +64,7 @@ when isMainModule:
     withBackend:
       scenario1.test(session, baseUrl)
       threads.test(session, baseUrl)
-      # TODO: Fix the issue181 test.
-      # issue181.test(session, baseUrl)
+      issue181.test(session, baseUrl)
 
     session.close()
   except:

tests/browsertests/common.nim

@@ -22,6 +22,11 @@ template sendKeys*(session: Session, element, keys: string) =
   check el.isSome()
   el.get().sendKeys(keys)
 
+template clear*(session: Session, element: string) =
+  let el = session.findElement(element)
+  check el.isSome()
+  el.get().clear()
+
 template sendKeys*(session: Session, element: string, keys: varargs[Key]) =
   let el = session.findElement(element)
   check el.isSome()
@@ -31,8 +36,8 @@ template sendKeys*(session: Session, element: string, keys: varargs[Key]) =
   for key in keys:
     session.press(key)
 
-template ensureExists*(session: Session, element: string) =
-  let el = session.findElement(element)
+template ensureExists*(session: Session, element: string, strategy=CssSelector) =
+  let el = session.findElement(element, strategy)
   check el.isSome()
 
 template check*(session: Session, element: string, function: untyped) =
@@ -69,9 +74,21 @@ proc waitForLoad*(session: Session, timeout=20000) =
 proc wait*(session: Session, msTimeout: int = 5000) =
   session.waitForLoad(msTimeout)
 
+proc setUserRank*(session: Session, baseUrl, user, rank: string) =
+  with session:
+    navigate(baseUrl & "profile/" & user)
+    wait()
+
+    click "#settings-tab"
+
+    click "#rank-field"
+    click("#rank-field option#rank-" & rank.toLowerAscii)
+
+    click "#save-btn"
+    wait()
+
 proc logout*(session: Session) =
   with session:
-    wait()
     click "#profile-btn"
     click "#profile-btn #logout-btn"
     wait()
@@ -83,6 +100,9 @@ proc login*(session: Session, user, password: string) =
   with session:
     click "#login-btn"
 
+    clear "#login-form input[name='username']"
+    clear "#login-form input[name='password']"
+
     sendKeys "#login-form input[name='username']", user
     sendKeys "#login-form input[name='password']", password
 
@@ -99,6 +119,10 @@ proc register*(session: Session, user, password: string) =
   with session:
     click "#signup-btn"
 
+    clear "#signup-form input[name='email']"
+    clear "#signup-form input[name='username']"
+    clear "#signup-form input[name='password']"
+
     sendKeys "#signup-form input[name='email']", user & "@" & user & ".com"
     sendKeys "#signup-form input[name='username']", user
     sendKeys "#signup-form input[name='password']", password
@@ -125,16 +149,3 @@ proc createThread*(session: Session, title, content: string) =
 
     checkText "#thread-title", title
     checkText ".original-post div.post-content", content
-
-proc changeRank*(session: Session, rank: string) =
-  with session:
-    # Make sure the "Settings" tab is selected.
-    click ".profile-tabs li:nth-child(2)"
-
-    click "#rank-field"
-    click "#rank-field option#rank-" & rank.toLowerAscii()
-
-    wait()
-
-    # TODO: Getting an "element click intercepted" error here.
-    click "#save-btn"

tests/browsertests/issue181.nim

@@ -14,33 +14,27 @@ proc test*(session: Session, baseUrl: string) =
 
       # Change rank to `user` so they can post.
       login("admin", "admin")
-
-      navigate(baseUrl & "profile/user")
-      wait()
-      changeRank("user")
+      setUserRank(baseUrl, "issue181", "user")
       logout()
 
       login("issue181", "issue181")
+      navigate(baseUrl)
+      wait()
 
       const title = "Testing issue 181."
       createThread(title, "Test for issue #181")
 
       logout()
-      wait()
 
       login("admin", "admin")
 
       # Ban our user.
-      navigate(baseUrl & "profile/issue181")
-      changeRank("banned")
+      setUserRank(baseUrl, "issue181", "banned")
 
       # Make sure the banned user's thread is still visible.
       navigate(baseUrl)
+      wait()
       ensureExists("tr.banned")
       checkText("tr.banned .thread-title > a", title)
       logout()
       checkText("tr.banned .thread-title > a", title)
-
-  session.navigate(baseUrl)
-  session.wait()
-  logout(session)

tests/browsertests/scenario1.nim

@@ -31,6 +31,4 @@ proc test*(session: Session, baseUrl: string) =
     with session:
       register("test", "test")
 
-  session.navigate(baseUrl)
-  session.wait()
-  logout(session)
+  session.logout()

tests/browsertests/threads.nim

@@ -2,18 +2,22 @@ import unittest, options, os, common
 
 import webdriver
 
-proc test*(session: Session, baseUrl: string) =
-  let
-    userTitleStr = "This is a user thread!"
-    userContentStr = "A user has filled this out"
+let
+  userTitleStr = "This is a user thread!"
+  userContentStr = "A user has filled this out"
 
-    adminTitleStr = "This is a thread title!"
-    adminContentStr = "This is content"
+  adminTitleStr = "This is a thread title!"
+  adminContentStr = "This is content"
 
+proc banUser(session: Session, baseUrl: string) =
+  with session:
+    login "admin", "admin"
+    setUserRank baseUrl, "user", "banned"
+    logout()
+
+proc userTests(session: Session, baseUrl: string) =
   suite "user thread tests":
-    session.navigate(baseUrl)
-    session.wait()
-    login(session, "user", "user")
+    session.login("user", "user")
 
     setup:
       session.navigate(baseUrl)
@@ -33,19 +37,57 @@ proc test*(session: Session, baseUrl: string) =
         checkText "#thread-title", userTitleStr
         checkText ".original-post div.post-content", userContentStr
 
-    session.navigate(baseUrl)
-    session.wait()
-    logout(session)
+    session.logout()
 
+proc anonymousTests(session: Session, baseUrl: string) =
+
+  suite "anonymous user tests":
+    with session:
+      navigate baseUrl
+      wait()
+
+    test "can view banned thread":
+      with session:
+        ensureExists userTitleStr, LinkTextSelector
+
+    with session:
+      navigate baseUrl
+      wait()
+
+proc bannedTests(session: Session, baseUrl: string) =
+  suite "banned user thread tests":
+    with session:
+      navigate baseUrl
+      wait()
+      login "banned", "banned"
+
+    test "can't start thread":
+      with session:
+        click "#new-thread-btn"
+        wait()
+
+        sendKeys "#thread-title", "test"
+        sendKeys "#reply-textarea", "test"
+
+        click "#create-thread-btn"
+        wait()
+
+        ensureExists "#new-thread p.text-error"
+
+    session.logout()
+
+proc adminTests(session: Session, baseUrl: string) =
   suite "admin thread tests":
-    session.navigate(baseUrl)
-    session.wait()
-    login(session, "admin", "admin")
+    session.login("admin", "admin")
 
     setup:
       session.navigate(baseUrl)
       session.wait()
 
+    test "can view banned thread":
+      with session:
+        ensureExists userTitleStr, LinkTextSelector
+
     test "can create thread":
       with session:
         click "#new-thread-btn"
@@ -116,6 +158,19 @@ proc test*(session: Session, baseUrl: string) =
         # Make sure the forum post is gone
         checkIsNone adminTitleStr, LinkTextSelector
 
-    session.navigate(baseUrl)
-    session.wait()
-    logout(session)
+    session.logout()
+
+proc test*(session: Session, baseUrl: string) =
+  session.navigate(baseUrl)
+  session.wait()
+
+  userTests(session, baseUrl)
+
+  banUser(session, baseUrl)
+
+  bannedTests(session, baseUrl)
+  anonymousTests(session, baseUrl)
+  adminTests(session, baseUrl)
+
+  session.navigate(baseUrl)
+  session.wait()