Wait for AJAX validation

zanata · Feb 18, 2015 · 62414b6 · 62414b6
1 parent 2949c09
commit 62414b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java b/functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
@@ -57,13 +57,17 @@ public ResetPasswordPage clearFields() {
         log.info("Clear fields");
         waitForWebElement(usernameField).clear();
         waitForWebElement(emailField).clear();
+        defocus(usernameField);
+        defocus(emailField);
+        waitForPageSilence();
         return new ResetPasswordPage(getDriver());
     }
 
     public HomePage resetPassword() {
         log.info("Click Submit");
         defocus(usernameField);
         defocus(emailField);
+        waitForPageSilence();
         waitForWebElement(submitButton).click();
         return new HomePage(getDriver());
     }
@@ -72,6 +76,7 @@ public ResetPasswordPage resetFailure() {
         log.info("Click Submit");
         defocus(usernameField);
         defocus(emailField);
+        waitForPageSilence();
         waitForWebElement(submitButton).click();
         return new ResetPasswordPage(getDriver());
     }

diff --git a/zanata-war/src/main/resources/ValidationMessages.properties b/zanata-war/src/main/resources/ValidationMessages.properties
@@ -15,7 +15,6 @@ javax.validation.constraints.Url.message=must be a valid URL
 #javax.validation.constraints.UrlNoSlash.message=must be a valid URL (without final slash)
 javax.validation.constraints.NotDuplicateEmail.message=duplicate email
 javax.validation.constraints.EmailList.message=invalid email or incorrect comma placement
-org.hibernate.validator.constraints.NotEmpty.message=may not be empty
 org.jboss.seam.captcha.error=incorrect response
 
 validation.username.constraints=Between 3 and 20 lowercase letters, numbers and underscores only