Merge pull request #83 from zanata/fix-reset-password-test

Fix reset password test
zanata · Jul 31, 2013 · f230fc6 · f230fc6
2 parents 930aee1 + db0bba4
commit f230fc6
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java b/functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
@@ -75,7 +75,7 @@ public void signInFailure()
 
    @Test
    @Ignore("RHBZ-987707 | Cannot intercept email yet")
-   public void resetPassword()
+   public void resetPasswordSuccessful()
    {
       SignInPage signInPage = new BasicWorkFlow().goToHome().clickSignInLink();
       ResetPasswordPage resetPasswordPage = signInPage.gotToResetPassword();
@@ -85,7 +85,7 @@ public void resetPassword()
    }
 
    @Test
-   public void resetPasswordFailure()
+   public void resetPasswordFailureForInvalidAccount()
    {
       SignInPage signInPage = new BasicWorkFlow().goToHome().clickSignInLink();
       ResetPasswordPage resetPasswordPage = signInPage.gotToResetPassword();
@@ -109,24 +109,33 @@ public void invalidResetPasswordFieldEntries()
       resetPasswordPage = resetPasswordPage.enterUserName("b").enterEmail("b");
       resetPasswordPage = resetPasswordPage.resetFailure();
 
-      assertThat("Two field errors are displayed", resetPasswordPage.waitForErrors(),
+      assertThat("Invalid email error is displayed", resetPasswordPage.waitForErrors(),
             Matchers.hasItem(invalidEmailError));
-      assertThat("Username error shows",
+
+      assertThat("(One of the) Username error shows",
             invalidUsernameErrors.contains(resetPasswordPage.getErrors().get(0)));
 
    }
 
    @Test
    public void emptyResetPasswordFieldEntries()
    {
-      String emptyUsernameError = "size must be between 3 and 20";
+      // Both are valid, but show seemingly at random
+      List<String> emptyUsernameErrors = new ArrayList<String>();
+      emptyUsernameErrors.add("size must be between 3 and 20");
+      emptyUsernameErrors.add("must match ^[a-z\\d_]{3,20}$");
       String emptyEmailError = "may not be empty";
+
       SignInPage signInPage = new BasicWorkFlow().goToHome().clickSignInLink();
       ResetPasswordPage resetPasswordPage = signInPage.gotToResetPassword();
       resetPasswordPage = resetPasswordPage.clearFields();
       resetPasswordPage = resetPasswordPage.resetFailure();
-      assertThat("Two field errors are displayed", resetPasswordPage.waitForErrors(),
-            Matchers.contains(emptyUsernameError, emptyEmailError));
+
+      assertThat("Empty email error is displayed", resetPasswordPage.waitForErrors(),
+            Matchers.hasItem(emptyEmailError));
+
+      assertThat("(One of the) Username error shows",
+            emptyUsernameErrors.contains(resetPasswordPage.getErrors().get(0)));
    }
 
 }