Merge branch 'master' into cdi-prep

Conflicts: zanata-war/pom.xml zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java zanata-war/src/main/java/org/zanata/action/LanguageAction.java zanata-war/src/main/java/org/zanata/action/LanguagesAction.java zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
zanata · Feb 26, 2015 · 69eb577 · 69eb577
2 parents bfcfd54 + ee0c8ec
commit 69eb577
Show file tree

Hide file tree

Showing 97 changed files with 2,401 additions and 2,030 deletions.
diff --git a/functional-test/src/main/java/org/zanata/page/AbstractPage.java b/functional-test/src/main/java/org/zanata/page/AbstractPage.java
@@ -46,13 +46,12 @@
 @Slf4j
 public class AbstractPage {
     private final WebDriver driver;
-    private final FluentWait<WebDriver> ajaxWaitForSec;
 
     public AbstractPage(final WebDriver driver) {
         PageFactory.initElements(new AjaxElementLocatorFactory(driver, 10),
                 this);
         this.driver = driver;
-        ajaxWaitForSec = WebElementUtil.waitForAMoment(driver);
+        assert driver instanceof JavascriptExecutor;
         waitForPageSilence();
     }
 
@@ -75,6 +74,10 @@ public WebDriver getDriver() {
         return driver;
     }
 
+    public JavascriptExecutor getExecutor() {
+        return (JavascriptExecutor) getDriver();
+    }
+
     public String getUrl() {
         return driver.getCurrentUrl();
     }
@@ -84,7 +87,7 @@ protected void logWaiting(String msg) {
     }
 
     public FluentWait<WebDriver> waitForAMoment() {
-        return ajaxWaitForSec;
+        return WebElementUtil.waitForAMoment(driver);
     }
 
     /**

diff --git a/functional-test/src/main/java/org/zanata/page/CorePage.java b/functional-test/src/main/java/org/zanata/page/CorePage.java
@@ -137,13 +137,17 @@ public boolean apply(WebDriver input) {
         return getErrors();
     }
 
-    public String getNotificationMessage() {
+    public String getNotificationMessage(By elementBy) {
         log.info("Query notification message");
-        List<WebElement> messages = waitForElementExists(By.id("messages"))
-                        .findElements(By.tagName("li"));
+        List<WebElement> messages = waitForElementExists(elementBy)
+            .findElements(By.tagName("li"));
         return messages.size() > 0 ? messages.get(0).getText() : "";
     }
 
+    public String getNotificationMessage() {
+        return getNotificationMessage(By.id("messages"));
+    }
+
     public boolean expectNotification(final String notification) {
         String msg = "notification " + notification;
         logWaiting(msg);

diff --git a/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java b/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
@@ -26,6 +26,8 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.zanata.page.BasePage;
+import org.zanata.page.languages.LanguagesPage;
+import org.zanata.util.Checkbox;
 import org.zanata.util.WebElementUtil;
 
 import java.util.HashMap;
@@ -84,19 +86,16 @@ public AddLanguagePage waitForPluralsWarning() {
         return new AddLanguagePage(getDriver());
     }
 
-    public AddLanguagePage enableLanguageByDefault() {
-        log.info("Click Enable by default");
-        if (!waitForWebElement(enabledByDefaultCheckbox).isSelected()) {
-            waitForWebElement(enabledByDefaultCheckbox).click();
-        }
-        return new AddLanguagePage(getDriver());
-    }
+    public AddLanguagePage enableLanguageByDefault(boolean enable) {
+        log.info("Click Enable by default to:" + enable);
+        Checkbox enabledByDefault = Checkbox.of(waitForWebElement(enabledByDefaultCheckbox));
 
-    public AddLanguagePage disableLanguageByDefault() {
-        log.info("Click Disable by default");
-        if (waitForWebElement(enabledByDefaultCheckbox).isSelected()) {
-            waitForWebElement(enabledByDefaultCheckbox).click();
+        if (enable) {
+            enabledByDefault.check();
+        } else {
+            enabledByDefault.uncheck();
         }
+
         return new AddLanguagePage(getDriver());
     }
 
@@ -125,9 +124,9 @@ public boolean apply(WebDriver input) {
         return map;
     }
 
-    public ManageLanguagePage saveLanguage() {
+    public LanguagesPage saveLanguage() {
         log.info("Click Save");
         clickAndCheckErrors(waitForWebElement(saveButton));
-        return new ManageLanguagePage(getDriver());
+        return new LanguagesPage(getDriver());
     }
 }
diff --git a/functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java b/functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
@@ -53,12 +53,6 @@ public ServerConfigurationPage goToServerConfigPage() {
         return new ServerConfigurationPage(getDriver());
     }
 
-    public ManageLanguagePage goToManageLanguagePage() {
-        log.info("Click Manage Languages");
-        clickLinkAfterAnimation(MANAGE_LANGUAGE_LINK);
-        return new ManageLanguagePage(getDriver());
-    }
-
     public ManageUserPage goToManageUserPage() {
         log.info("Click Manage Users");
         clickLinkAfterAnimation(MANAGE_USER_LINK);

diff --git a/functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java b/functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java