Changeset 952 for branches/features

Timestamp:

May 30, 2011, 12:55:02 PM (14 years ago)

Author:

gav

Message:

Functional tests, refactor login/logout.

Location:

branches/features/purchaseOrders/test/functional

Files:

• GebReportingSpecBase.groovy (modified) (1 diff)
• LoginSpec.groovy (modified) (5 diffs)
• gnumims/functional/pages/GrailsPage.groovy (modified) (1 diff)
• gnumims/functional/pages/HomePage.groovy (modified) (1 diff)
• gnumims/functional/pages/LoginPage.groovy (modified) (1 diff)

branches/features/purchaseOrders/test/functional/GebReportingSpecBase.groovy

@@ -36 +36 @@
         else loginButton.click(HomePage)
     }
+
+    void logout() {
+        if(logoutButton)
+            logoutButton.click()
+    }
+
 }

branches/features/purchaseOrders/test/functional/LoginSpec.groovy

@@ -14 +14 @@
         then:
         at LoginPage
+        verifyLoggedOut()
     }
 
@@ -22 +23 @@
         then:
         at HomePage
+        verifyLoggedIn()
     }
 
     def "When we logout, we go to the logout page"() {
         when:
-        logout.click()
+        logout()
 
         then:
         at LogoutPage
+        verifyLoggedOut()
         verifyLogoutMessage()
     }
@@ -40 +43 @@
         then:
         at LoginPage
+        verifyLoggedOut()
         verifyLoginFailureMessage()
+
+        cleanup:
+        logout()
 
         where:
@@ -59 +66 @@
         'admin'   | 'pas*'  // Star Wildcard in pattern.
         'admin'   | 'pas%'  // Percentage Wildcard in pattern.
+        'admin'   | 'pas.'  // Dot Wildcard in pattern.
+
         'bogus'   | 'pass'  /* Bogus Username. */
         ''        | 'pass'  // None
@@ -71 +80 @@
         '*'       | 'pass'  // Star Wildcard.
         '%'       | 'pass'  // Percentage Wildcard.
-        '.'       | 'pass'     // Dot Wildcard.
+        '.'       | 'pass'  // Dot Wildcard.
         'admi*'   | 'pass'  // Star Wildcard in pattern.
         'admi%'   | 'pass'  // Percentage Wildcard in pattern.
+        'admi.'   | 'pass'  // Dot Wildcard in pattern.
     }
 

branches/features/purchaseOrders/test/functional/gnumims/functional/pages/GrailsPage.groovy

@@ -39 +39 @@
         controllerName { pageId.split('\\.')[0] }
         actionName { pageId.split('\\.')[1] }
+        logoutButton(to:LogoutPage, required: false) { $("a[class=logoutButton]") }
+        message { $("div.body div.message").text() }
+    }
+
+    def verifyLoggedIn() {
+        assert logoutButton
+        return true
+
+    }
+
+    def verifyLoggedOut() {
+        assert !logoutButton
+        return true
+
     }
 

branches/features/purchaseOrders/test/functional/gnumims/functional/pages/HomePage.groovy

@@ -6 +6 @@
 
     static content = {
-        message { $("div.body div.message").text() }
-        logout(to:LogoutPage) { $("a[class=logoutButton]") }
     }
 }

branches/features/purchaseOrders/test/functional/gnumims/functional/pages/LoginPage.groovy

@@ -13 +13 @@
 
     def verifyLoginFailureMessage() {
-        assert message.contains("wrong username/password.")
+        assert message.contains("wrong username/password")
         return true
     }