Merge pull request #494 from zanata/update-to-assertj-admin

Update and fix administration tests
zanata · Jun 17, 2014 · 85c7bce · 85c7bce
2 parents 636dc18 + fa99636
commit 85c7bce
Show file tree

Hide file tree

Showing 6 changed files with 172 additions and 193 deletions.
diff --git a/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java b/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
@@ -68,21 +68,6 @@ public ManageUserAccountPage(WebDriver driver) {
         roleMap.put("user", "4");
     }
 
-    public ManageUserAccountPage enterUsername(final String username) {
-        waitForTenSec().until(new Predicate<WebDriver>() {
-            @Override
-            public boolean apply(WebDriver input) {
-                WebElement usernameField = input.findElement(usernameBy);
-                usernameField.clear();
-                usernameField.sendKeys(username);
-                return input.findElement(usernameBy).getAttribute("value")
-                        .equals(username);
-            }
-        });
-
-        return new ManageUserAccountPage(getDriver());
-    }
-
     public ManageUserAccountPage enterPassword(String password) {
         passwordField.sendKeys(password);
         return new ManageUserAccountPage(getDriver());
@@ -123,17 +108,4 @@ public ManageUserPage cancelEditUser() {
         return new ManageUserPage(getDriver());
     }
 
-    public ManageUserAccountPage clearFields() {
-        waitForTenSec().until(new Predicate<WebDriver>() {
-            @Override
-            public boolean apply(WebDriver input) {
-                input.findElement(usernameBy).clear();
-                return input.findElement(usernameBy).getAttribute("value")
-                        .isEmpty();
-            }
-        });
-        passwordField.clear();
-        passwordConfirmField.clear();
-        return new ManageUserAccountPage(getDriver());
-    }
 }
diff --git a/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java b/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
@@ -20,7 +20,6 @@
  */
 package org.zanata.feature.administration;
 
-import org.hamcrest.Matchers;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -34,7 +33,7 @@
 import org.zanata.util.AddUsersRule;
 import org.zanata.workflow.LoginWorkFlow;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Damian Jansen <a
@@ -53,8 +52,10 @@ public void goToEditPageContent() {
         EditHomeContentPage editHomeContentPage =
                 dashboard.goToHomePage().goToEditPageContent();
 
-        assertThat("Correct page", editHomeContentPage.getTitle(),
-                Matchers.equalTo("Zanata: Edit Home Page"));
+        assertThat(editHomeContentPage.getTitle())
+                .isEqualTo("Zanata: Edit Home Page")
+                .as("Correct page");
+
         editHomeContentPage = editHomeContentPage.enterText("Test");
         HomePage homePage = editHomeContentPage.update();
         editHomeContentPage = homePage.goToEditPageContent();
@@ -67,14 +68,22 @@ public void goToEditPageCode() {
         EditHomeCodePage editHomeCodePage =
                 dashboard.goToHomePage().goToEditPageCode();
 
-        assertThat("Correct page", editHomeCodePage.getTitle(),
-                Matchers.equalTo("Zanata: Edit Page Code"));
+        assertThat(editHomeCodePage.getTitle())
+                .isEqualTo("Zanata: Edit Page Code")
+                .as("Correct page");
+
         HomePage homePage = editHomeCodePage.enterText("Test").update();
-        assertThat("Message displayed", homePage.getNotificationMessage(),
-                Matchers.equalTo("Home content was successfully updated."));
+
+        assertThat(homePage
+                .expectNotification("Home content was successfully updated."))
+                .isTrue()
+                .as("Message displayed");
+
         editHomeCodePage = homePage.goToEditPageCode();
         homePage = editHomeCodePage.cancelUpdate();
-        assertThat("Homepage text has been updated",
-                homePage.getMainBodyContent(), Matchers.equalTo("Test"));
+
+        assertThat(homePage.getMainBodyContent())
+                .isEqualTo("Test")
+                .as("Homepage text has been updated");
     }
 }