From 751aba289a5c77138a3739dfc169d67974ad53b3 Mon Sep 17 00:00:00 2001 From: Damian Jansen Date: Fri, 15 May 2015 15:54:01 +1000 Subject: [PATCH] ClickElement replaces readyElement(element).click This forces all clicks to move the element into focus and wait for obstructions to be gone before proceeding. --- .../main/java/org/zanata/page/BasePage.java | 17 ++++------------- .../main/java/org/zanata/page/CorePage.java | 6 +++--- .../zanata/page/account/EditProfilePage.java | 4 ++-- .../page/account/InactiveAccountPage.java | 4 ++-- .../org/zanata/page/account/RegisterPage.java | 8 ++++---- .../page/account/ResetPasswordPage.java | 4 ++-- .../org/zanata/page/account/SignInPage.java | 12 ++++++------ .../page/administration/AddLanguagePage.java | 4 ++-- .../administration/EditHomeContentPage.java | 4 ++-- .../EditRoleAssignmentPage.java | 4 ++-- .../page/administration/ManageSearchPage.java | 6 +++--- .../administration/ManageUserAccountPage.java | 12 ++++++------ .../page/administration/ManageUserPage.java | 2 +- .../administration/RoleAssignmentsPage.java | 4 ++-- .../ServerConfigurationPage.java | 3 ++- .../TranslationMemoryEditPage.java | 6 +++--- .../administration/TranslationMemoryPage.java | 19 ++++++++++--------- .../page/dashboard/DashboardActivityTab.java | 2 +- .../page/dashboard/DashboardProjectsTab.java | 2 +- .../DashboardAccountTab.java | 4 ++-- .../dashboardsettings/DashboardClientTab.java | 2 +- .../DashboardProfileTab.java | 2 +- .../page/googleaccount/GoogleAccountPage.java | 6 +++--- .../googleaccount/GooglePermissionsPage.java | 2 +- .../page/groups/CreateVersionGroupPage.java | 2 +- .../zanata/page/groups/VersionGroupPage.java | 4 ++-- .../zanata/page/groups/VersionGroupsPage.java | 4 ++-- .../page/languages/ContactTeamPage.java | 2 +- .../zanata/page/languages/LanguagePage.java | 18 +++++++++--------- .../zanata/page/languages/LanguagesPage.java | 4 ++-- .../page/projects/ProjectVersionsPage.java | 2 +- .../zanata/page/projects/ProjectsPage.java | 2 +- .../projectversion/CreateVersionPage.java | 2 +- .../versionsettings/VersionDocumentsTab.java | 6 +++--- .../page/utility/ContactAdminFormPage.java | 2 +- .../org/zanata/page/utility/HomePage.java | 2 +- .../page/webtrans/DocumentsViewPage.java | 2 +- .../org/zanata/page/webtrans/EditorPage.java | 2 +- 38 files changed, 93 insertions(+), 100 deletions(-) diff --git a/functional-test/src/main/java/org/zanata/page/BasePage.java b/functional-test/src/main/java/org/zanata/page/BasePage.java index 4e3061da96..3991e8c94e 100644 --- a/functional-test/src/main/java/org/zanata/page/BasePage.java +++ b/functional-test/src/main/java/org/zanata/page/BasePage.java @@ -85,7 +85,7 @@ public BasePage(final WebDriver driver) { public DashboardBasePage goToMyDashboard() { log.info("Click Dashboard menu link"); - readyElement(userAvatar).click(); + clickElement(userAvatar); clickLinkAfterAnimation(BY_DASHBOARD_LINK); return new DashboardBasePage(getDriver()); } @@ -101,18 +101,9 @@ private void clickNavMenuItem(final WebElement menuItem) { slightPause(); if (!menuItem.isDisplayed()) { // screen is too small the menu become dropdown - readyElement(existingElement(By.id("nav-main")), By.tagName("a")).click(); + clickElement(readyElement(existingElement(By.id("nav-main")), By.tagName("a"))); } - waitForAMoment().withMessage("displayed: " + menuItem).until( - new Predicate() { - @Override - public boolean apply(WebDriver input) { - return menuItem.isDisplayed(); - } - }); - waitForAMoment().withMessage("clickable: " + menuItem).until( - ExpectedConditions.elementToBeClickable(menuItem)); - menuItem.click(); + clickElement(menuItem); } public VersionGroupsPage goToGroups() { @@ -318,7 +309,7 @@ public WebElement apply(WebDriver driver) { return null; } }); - searchItem.click(); + clickElement(searchItem); } public void clickWhenTabEnabled(final WebElement tab) { diff --git a/functional-test/src/main/java/org/zanata/page/CorePage.java b/functional-test/src/main/java/org/zanata/page/CorePage.java index c1e41d9a61..2e0b53b9bc 100644 --- a/functional-test/src/main/java/org/zanata/page/CorePage.java +++ b/functional-test/src/main/java/org/zanata/page/CorePage.java @@ -62,12 +62,12 @@ public String getTitle() { public HomePage goToHomePage() { log.info("Click Zanata home icon"); scrollToTop(); - readyElement(homeLink).click(); + clickElement(homeLink); return new HomePage(getDriver()); } protected void clickAndCheckErrors(WebElement button) { - button.click(); + clickElement(button); List errors = getErrors(); if (!errors.isEmpty()) { throw new RuntimeException(Joiner.on(";").join(errors)); @@ -75,7 +75,7 @@ protected void clickAndCheckErrors(WebElement button) { } protected void clickAndExpectErrors(WebElement button) { - button.click(); + clickElement(button); refreshPageUntil(this, new Predicate() { @Override public boolean apply(WebDriver input) { diff --git a/functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java b/functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java index 24f0326dcf..2ca8499a1a 100644 --- a/functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java +++ b/functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java @@ -68,13 +68,13 @@ public EditProfilePage enterEmail(String email) { public HomePage clickSave() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new HomePage(getDriver()); } public EditProfilePage clickSaveAndExpectErrors() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new EditProfilePage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java b/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java index 369354f4dd..09d18257ba 100644 --- a/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java +++ b/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java @@ -38,7 +38,7 @@ public InactiveAccountPage(WebDriver driver) { public HomePage clickResendActivationEmail() { log.info("Click resend activation email"); - readyElement(By.id("resendEmail")).click(); + clickElement(By.id("resendEmail")); return new HomePage(getDriver()); } @@ -49,7 +49,7 @@ public InactiveAccountPage enterNewEmail(String email) { } public HomePage clickUpdateEmail() { - readyElement(By.id("inactiveAccountForm:emailField:updateEmail")).click(); + clickElement(By.id("inactiveAccountForm:emailField:updateEmail")); return new HomePage(getDriver()); } } diff --git a/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java b/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java index 57a9336cb2..32d3a6c85d 100644 --- a/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java +++ b/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java @@ -89,13 +89,13 @@ public RegisterPage enterPassword(String password) { // TODO: Add a "signup success" page public HomePage register() { log.info("Click Sign Up"); - readyElement(signUpButton).click(); + clickElement(signUpButton); return new HomePage(getDriver()); } public RegisterPage registerFailure() { log.info("Click Sign Up"); - readyElement(signUpButton).click(); + clickElement(signUpButton); return new RegisterPage(getDriver()); } @@ -127,13 +127,13 @@ public String getPageTitle() { public SignInPage goToSignIn() { log.info("Click Log In"); - readyElement(loginLink).click(); + clickElement(loginLink); return new SignInPage(getDriver()); } public RegisterPage clickPasswordShowToggle() { log.info("Click Show/Hide"); - readyElement(showHideToggleButton).click(); + clickElement(showHideToggleButton); return new RegisterPage(getDriver()); } 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 index afca467631..ec327fd80b 100644 --- a/functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java +++ b/functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java @@ -59,7 +59,7 @@ public HomePage resetPassword() { log.info("Click Submit"); defocus(usernameEmailField); waitForPageSilence(); - readyElement(submitButton).click(); + clickElement(submitButton); return new HomePage(getDriver()); } @@ -67,7 +67,7 @@ public ResetPasswordPage resetFailure() { log.info("Click Submit"); defocus(usernameEmailField); waitForPageSilence(); - readyElement(submitButton).click(); + clickElement(submitButton); return new ResetPasswordPage(getDriver()); } } diff --git a/functional-test/src/main/java/org/zanata/page/account/SignInPage.java b/functional-test/src/main/java/org/zanata/page/account/SignInPage.java index 812f23a837..54a6e55c51 100644 --- a/functional-test/src/main/java/org/zanata/page/account/SignInPage.java +++ b/functional-test/src/main/java/org/zanata/page/account/SignInPage.java @@ -61,37 +61,37 @@ public SignInPage enterPassword(String password) { public DashboardBasePage clickSignIn() { log.info("Click Sign In"); - readyElement(signInButton).click(); + clickElement(signInButton); return new DashboardBasePage(getDriver()); } public SignInPage clickSignInExpectError() { log.info("Click Sign In"); - readyElement(signInButton).click(); + clickElement(signInButton); return new SignInPage(getDriver()); } public InactiveAccountPage clickSignInExpectInactive() { log.info("Click Sign In"); - readyElement(signInButton).click(); + clickElement(signInButton); return new InactiveAccountPage(getDriver()); } public GoogleAccountPage selectGoogleOpenID() { log.info("Click 'Google'"); - readyElement(googleButton).click(); + clickElement(googleButton); return new GoogleAccountPage(getDriver()); } public ResetPasswordPage goToResetPassword() { log.info("Click Forgot Password"); - readyElement(forgotPasswordLink).click(); + clickElement(forgotPasswordLink); return new ResetPasswordPage(getDriver()); } public RegisterPage goToRegister() { log.info("Click Sign Up"); - readyElement(signUpLink).click(); + clickElement(signUpLink); return new RegisterPage(getDriver()); } 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 index 84b50c2efb..42e90e472e 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java @@ -90,7 +90,7 @@ public AddLanguagePage expectPluralsWarning() { public AddLanguagePage enableLanguageByDefault() { log.info("Click Enable by default"); if (!readyElement(enabledByDefaultCheckbox).isSelected()) { - readyElement(enabledByDefaultCheckbox).click(); + clickElement(enabledByDefaultCheckbox); } return new AddLanguagePage(getDriver()); } @@ -98,7 +98,7 @@ public AddLanguagePage enableLanguageByDefault() { public AddLanguagePage disableLanguageByDefault() { log.info("Click Disable by default"); if (readyElement(enabledByDefaultCheckbox).isSelected()) { - readyElement(enabledByDefaultCheckbox).click(); + clickElement(enabledByDefaultCheckbox); } return new AddLanguagePage(getDriver()); diff --git a/functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java b/functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java index c0967102e7..5a9a1f73cb 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java @@ -49,13 +49,13 @@ public EditHomeContentPage enterText(String text) { public HomePage update() { log.info("Click Update"); - readyElement(updateButton).click(); + clickElement(updateButton); return new HomePage(getDriver()); } public HomePage cancelUpdate() { log.info("Click Cancel"); - readyElement(cancelButton).click(); + clickElement(cancelButton); return new HomePage(getDriver()); } } diff --git a/functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java b/functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java index 4537576f1e..a4dc33e8c9 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java @@ -63,13 +63,13 @@ public EditRoleAssignmentPage selectRole(String role) { public RoleAssignmentsPage saveRoleAssignment() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new RoleAssignmentsPage(getDriver()); } public RoleAssignmentsPage cancelEditRoleAssignment() { log.info("Click Cancel"); - readyElement(cancelButton).click(); + clickElement(cancelButton); return new RoleAssignmentsPage(getDriver()); } } diff --git a/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java b/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java index 5bd4e8659e..b40a96d13a 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java @@ -71,7 +71,7 @@ public ManageSearchPage selectAllActionsFor(String clazz) { public ManageSearchPage clickSelectAll() { log.info("Click Select All"); - readyElement(selectAllButton).click(); + clickElement(selectAllButton); // It seems that if the Select All and Perform buttons are clicked too // quickly in succession, the operation will fail try { @@ -101,7 +101,7 @@ public boolean allActionsSelected() { public ManageSearchPage performSelectedActions() { log.info("Click Perform Actions"); - readyElement(performButton).click(); + clickElement(performButton); waitForAMoment().until(new Predicate() { @Override public boolean apply(WebDriver input) { @@ -121,7 +121,7 @@ public ManageSearchPage expectActionsToFinish() { public ManageSearchPage abort() { log.info("Click Abort"); - readyElement(abortButton).click(); + clickElement(abortButton); return new ManageSearchPage(getDriver()); } 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 index b88bbd8971..b798cecb6f 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java @@ -70,14 +70,14 @@ public ManageUserAccountPage enterConfirmPassword(String confirmPassword) { public ManageUserAccountPage clickEnabled() { log.info("Click Enabled"); - readyElement(enabledField).click(); + clickElement(enabledField); return new ManageUserAccountPage(getDriver()); } public ManageUserAccountPage clickRole(String role) { log.info("Click role {}", role); - readyElement(By.id("userdetailForm:rolesField:roles:" - .concat(roleMap.get(role)))).click(); + clickElement(readyElement(By.id("userdetailForm:rolesField:roles:" + .concat(roleMap.get(role))))); return new ManageUserAccountPage(getDriver()); } @@ -89,19 +89,19 @@ public boolean isRoleChecked(String role) { public ManageUserPage saveUser() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new ManageUserPage(getDriver()); } public ManageUserAccountPage saveUserExpectFailure() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new ManageUserAccountPage(getDriver()); } public ManageUserPage cancelEditUser() { log.info("Click Cancel"); - readyElement(cancelButton).click(); + clickElement(cancelButton); return new ManageUserPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java b/functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java index 914f6be47e..fb35f950e5 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java @@ -44,7 +44,7 @@ public ManageUserPage(WebDriver driver) { public ManageUserAccountPage editUserAccount(String username) { log.info("Click edit on {}", username); - findRowByUserName(username).click(); + clickElement(findRowByUserName(username)); return new ManageUserAccountPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java b/functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java index 531efe2d2f..1f8802bfcb 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java @@ -45,13 +45,13 @@ public RoleAssignmentsPage(WebDriver driver) { public RoleAssignmentsPage clickMoreActions() { log.info("Click More Actions dropdown"); - readyElement(moreActions).click(); + clickElement(moreActions); return new RoleAssignmentsPage(getDriver()); } public EditRoleAssignmentPage clickCreateNew() { log.info("Click Create New"); - readyElement(newRuleButton).click(); + clickElement(newRuleButton); return new EditRoleAssignmentPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java b/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java index 3063ce8fbf..ce9b5805a3 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java @@ -58,6 +58,7 @@ public ServerConfigurationPage(WebDriver driver) { private void enterTextConfigField(By by, String text) { scrollIntoView(readyElement(by)); + waitForNotificationsGone(); new Actions(getDriver()).moveToElement(readyElement(by)) .click() .sendKeys(Keys.chord(Keys.CONTROL, "a")) @@ -191,7 +192,7 @@ public String getMaxActiveRequestsPerApiKey() { public AdministrationPage save() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new AdministrationPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java b/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java index c1896e5549..9a7bc650f5 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java @@ -55,19 +55,19 @@ public TranslationMemoryEditPage enterMemoryDescription(String description) { public TranslationMemoryPage saveTM() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new TranslationMemoryPage(getDriver()); } public TranslationMemoryEditPage clickSaveAndExpectFailure() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new TranslationMemoryEditPage(getDriver()); } public TranslationMemoryPage cancelTM() { log.info("Click Cancel"); - readyElement(cancelButton).click(); + clickElement(cancelButton); return new TranslationMemoryPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java b/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java index 0ff6c10ec2..fb3faff46f 100644 --- a/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java +++ b/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java @@ -59,66 +59,67 @@ public TranslationMemoryPage(WebDriver driver) { public TranslationMemoryEditPage clickCreateNew() { log.info("Click Create New"); - readyElement(dropDownMenu).click(); + clickElement(dropDownMenu); clickLinkAfterAnimation(createTmLink); return new TranslationMemoryEditPage(getDriver()); } public TranslationMemoryPage clickOptions(String tmName) { log.info("Click Options dropdown for {}", tmName); - readyElement(findRowByTMName(tmName), listDropDownMenu).click(); + clickElement(readyElement(findRowByTMName(tmName), listDropDownMenu)); return new TranslationMemoryPage(getDriver()); } public TranslationMemoryPage clickImport(String tmName) { log.info("Click Import"); - readyElement(findRowByTMName(tmName), listImportButton).click(); + clickElement(readyElement(findRowByTMName(tmName), listImportButton)); return new TranslationMemoryPage(getDriver()); } public TranslationMemoryPage enterImportFileName(String importFileName) { log.info("Enter import TM filename {}", importFileName); readyElement(filenameInput).sendKeys(importFileName); + slightPause(); return new TranslationMemoryPage(getDriver()); } public TranslationMemoryPage clickUploadButtonAndAcknowledge() { log.info("Click and accept Upload button"); - readyElement(uploadButton).click(); + clickElement(uploadButton); switchToAlert().accept(); return new TranslationMemoryPage(getDriver()); } public Alert expectFailedUpload() { log.info("Click Upload"); - readyElement(uploadButton).click(); + clickElement(uploadButton); return switchToAlert(); } public TranslationMemoryPage clickClearTMAndAccept(String tmName) { log.info("Click and accept Clear {}", tmName); - readyElement(findRowByTMName(tmName), listClearButton).click(); + clickElement(readyElement(findRowByTMName(tmName), listClearButton)); switchToAlert().accept(); return new TranslationMemoryPage(getDriver()); } public TranslationMemoryPage clickClearTMAndCancel(String tmName) { log.info("Click and Cancel Clear {}", tmName); - readyElement(findRowByTMName(tmName), listClearButton).click(); + clickElement(readyElement(findRowByTMName(tmName), listClearButton)); switchToAlert().dismiss(); return new TranslationMemoryPage(getDriver()); } public TranslationMemoryPage clickDeleteTmAndAccept(String tmName) { log.info("Click and accept Delete {}", tmName); - readyElement(findRowByTMName(tmName), listDeleteButton).click(); + clickElement(readyElement(findRowByTMName(tmName), listDeleteButton)); switchToAlert().accept(); return new TranslationMemoryPage(getDriver()); } public TranslationMemoryPage clickDeleteTmAndCancel(String tmName) { log.info("Click and cancel Delete {}", tmName); - readyElement(findRowByTMName(tmName), listDeleteButton).click(); + clickElement(readyElement(findRowByTMName(tmName), listDeleteButton)); switchToAlert().dismiss(); return new TranslationMemoryPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java b/functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java index cf2567b657..7f203f28f4 100644 --- a/functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java +++ b/functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java @@ -53,7 +53,7 @@ public List getMyActivityList() { public boolean clickMoreActivity() { log.info("Click More Activity button"); final int activityListOrigSize = getMyActivityList().size(); - readyElement(moreActivityButton).click(); + clickElement(moreActivityButton); return waitForAMoment().until(new Function() { @Override public Boolean apply(WebDriver input) { diff --git a/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java b/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java index a6ebdcedde..828879da56 100644 --- a/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java +++ b/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java @@ -50,7 +50,7 @@ public List getMaintainedProjectList() { public CreateProjectPage clickOnCreateProjectLink() { log.info("Click Create Project"); - readyElement(createProjectLink).click(); + clickElement(createProjectLink); return new CreateProjectPage(getDriver()); } } diff --git a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java index 553e1de928..0ef57be903 100644 --- a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java +++ b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java @@ -61,7 +61,7 @@ public DashboardAccountTab typeNewAccountEmailAddress(String emailAddress) { public DashboardAccountTab clickUpdateEmailButton() { log.info("Click Update Email"); - readyElement(updateEmailButton).click(); + clickElement(updateEmailButton); return new DashboardAccountTab(getDriver()); } @@ -81,7 +81,7 @@ public DashboardAccountTab typeNewPassword(String newPassword) { public DashboardAccountTab clickUpdatePasswordButton() { log.info("Click Update Password"); - readyElement(changePasswordButton).click(); + clickElement(changePasswordButton); return new DashboardAccountTab(getDriver()); } } diff --git a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java index ce07b48678..6374651375 100644 --- a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java +++ b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java @@ -43,7 +43,7 @@ public DashboardClientTab(WebDriver driver) { public DashboardClientTab pressApiKeyGenerateButton() { log.info("Press Generate API Key"); - readyElement(generateApiKeyButton).click(); + clickElement(generateApiKeyButton); getDriver().switchTo().alert().accept(); return new DashboardClientTab(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java index ae932ddb0f..8ad5493d60 100644 --- a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java +++ b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java @@ -55,7 +55,7 @@ public DashboardProfileTab enterName(String name) { public DashboardProfileTab clickUpdateProfileButton() { log.info("Click Update"); - readyElement(updateProfileButton).click(); + clickElement(updateProfileButton); return new DashboardProfileTab(getDriver()); } } diff --git a/functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java b/functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java index a6dbb5ebfc..92f9297fc6 100644 --- a/functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java +++ b/functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java @@ -57,13 +57,13 @@ public GoogleAccountPage enterGooglePassword(String password) { public GooglePermissionsPage clickSignIn() { log.info("Click account Sign In"); - readyElement(signInButton).click(); + clickElement(signInButton); return new GooglePermissionsPage(getDriver()); } public GoogleManagePermissionsPage clickPermissionsSignIn() { log.info("Click account management Sign In"); - readyElement(signInButton).click(); + clickElement(signInButton); return new GoogleManagePermissionsPage(getDriver()); } @@ -79,7 +79,7 @@ public boolean hasRememberedAuthentication() { public GoogleAccountPage removeSavedAuthentication() { log.info("Click Sign in with different account"); - readyElement(signInDifferent).click(); + clickElement(signInDifferent); return new GoogleAccountPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java b/functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java index 27be75bc3b..9fe8f52d4c 100644 --- a/functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java +++ b/functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java @@ -50,7 +50,7 @@ public Boolean apply(WebDriver driver) { .isEnabled(); } }); - readyElement(approveAccessButton).click(); + clickElement(approveAccessButton); return new EditProfilePage(getDriver()); } } diff --git a/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java b/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java index ee1442401e..d61ee3f75c 100644 --- a/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java +++ b/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java @@ -82,7 +82,7 @@ public VersionGroupsPage saveGroup() { public CreateVersionGroupPage saveGroupFailure() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new CreateVersionGroupPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java b/functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java index d6cbb33e1e..29d28d2161 100644 --- a/functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java +++ b/functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java @@ -106,7 +106,7 @@ public List apply(WebDriver driver) { public VersionGroupPage addToGroup(int rowIndex) { WebElementUtil.getListItems(getDriver(), newVersionList) .get(rowIndex).click(); - readyElement(projectAddButton).click(); + clickElement(projectAddButton); return new VersionGroupPage(getDriver()); } @@ -190,7 +190,7 @@ public VersionGroupPage clickSettingsTab() { public VersionGroupPage clickLanguagesSettingsTab() { clickSettingsTab(); - readyElement(settingsLanguagesTab).click(); + clickElement(settingsLanguagesTab); return new VersionGroupPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java b/functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java index ebfec8ad83..4dc888dd9f 100644 --- a/functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java +++ b/functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java @@ -58,13 +58,13 @@ public List getGroupNames() { public CreateVersionGroupPage createNewGroup() { log.info("Click New Group button"); - readyElement(createGroupButton).click(); + clickElement(createGroupButton); return new CreateVersionGroupPage(getDriver()); } public VersionGroupPage goToGroup(String groupName) { log.info("Click group {}", groupName); - readyElement(groupTable).findElement(By.linkText(groupName)).click(); + clickElement(readyElement(groupTable).findElement(By.linkText(groupName))); return new VersionGroupPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java b/functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java index 218ead7fbc..9ef65b4a05 100644 --- a/functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java +++ b/functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java @@ -46,7 +46,7 @@ public ContactTeamPage enterMessage(String message) { public LanguagesPage clickSend() { log.info("Click the Send Message button"); - readyElement(sendButton).click(); + clickElement(sendButton); return new LanguagesPage(getDriver()); } } diff --git a/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java b/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java index d67be9af07..f3774b71d9 100644 --- a/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java +++ b/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java @@ -69,23 +69,23 @@ public LanguagePage(WebDriver driver) { public LanguagePage clickMoreActions() { log.info("Click More Actions"); - readyElement(moreActions).click(); + clickElement(moreActions); return new LanguagePage(getDriver()); } public ContactTeamPage clickContactCoordinatorsButton() { log.info("Click Contact Coordinators button"); - readyElement(contactCoordinatorsButton).click(); + clickElement(contactCoordinatorsButton); return new ContactTeamPage(getDriver()); } public LanguagePage gotoSettingsTab() { - readyElement(settingsTab).click(); + clickElement(settingsTab); return new LanguagePage(getDriver()); } public LanguagePage gotoMembersTab() { - readyElement(membersTab).click(); + clickElement(membersTab); return new LanguagePage(getDriver()); } @@ -100,7 +100,7 @@ public LanguagePage enableLanguageByDefault(boolean enable) { } public LanguagePage saveSettings() { - readyElement(saveButton).click(); + clickElement(saveButton); return new LanguagePage(getDriver()); } @@ -125,7 +125,7 @@ private String getMemberCount() { public LanguagePage joinLanguageTeam() { log.info("Click Join"); - readyElement(joinLanguageTeamButton).click(); + clickElement(joinLanguageTeamButton); // we need to wait for this join to finish before returning the page waitForAMoment().until(new Function() { @Override @@ -138,7 +138,7 @@ public Boolean apply(WebDriver driver) { public LanguagePage clickAddTeamMember() { log.info("Click Add Team Member"); - readyElement(addTeamMemberButton).click(); + clickElement(addTeamMemberButton); return this; } @@ -163,7 +163,7 @@ private LanguagePage enterUsername(String username) { private LanguagePage clickSearch() { log.info("Click Search"); - readyElement(addUserSearchButton).click(); + clickElement(addUserSearchButton); return new LanguagePage(getDriver()); } @@ -233,7 +233,7 @@ private String getListItemUsername(WebElement listItem) { public LanguagePage clickAddSelectedButton() { log.info("Click Add Selected"); - readyElement(addSelectedButton).click(); + clickElement(addSelectedButton); return new LanguagePage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java b/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java index a76124d54b..7b05068e2b 100644 --- a/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java +++ b/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java @@ -85,13 +85,13 @@ public List getLanguageLocales() { public LanguagesPage clickMoreActions() { log.info("Click More Actions dropdown"); - readyElement(moreActions).click(); + clickElement(moreActions); return new LanguagesPage(getDriver()); } public AddLanguagePage addNewLanguage() { log.info("Click Add New Language"); - readyElement(addLanguageLink).click(); + clickElement(addLanguageLink); return new AddLanguagePage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java b/functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java index 4aaa24c2aa..99a50b3ee7 100644 --- a/functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java +++ b/functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java @@ -118,7 +118,7 @@ public boolean apply(WebDriver input) { public ProjectVersionsPage clickSearchIcon() { log.info("Click Search icon"); - readyElement(existingElement(versions), searchIcon).click(); + clickElement(readyElement(existingElement(versions), searchIcon)); return new ProjectVersionsPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java b/functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java index 89c459299f..a2668a5196 100644 --- a/functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java +++ b/functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java @@ -50,7 +50,7 @@ public ProjectsPage(final WebDriver driver) { public CreateProjectPage clickOnCreateProjectLink() { log.info("Click Create Project"); - readyElement(createProjectButton).click(); + clickElement(createProjectButton); return new CreateProjectPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java b/functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java index ce6e2d53aa..bfaa4cae72 100644 --- a/functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java +++ b/functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java @@ -155,7 +155,7 @@ public VersionLanguagesPage saveVersion() { public CreateVersionPage saveExpectingError() { log.info("Click Save"); - readyElement(saveButton).click(); + clickElement(saveButton); return new CreateVersionPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java b/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java index d8109fc58d..e020d5c3fc 100644 --- a/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java +++ b/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java @@ -73,7 +73,7 @@ public boolean canSubmitDocument() { public VersionDocumentsTab cancelUpload() { log.info("Click Cancel"); - readyElement(cancelUploadButton).click(); + clickElement(cancelUploadButton); waitForAMoment().until(new Predicate() { @Override public boolean apply(WebDriver input) { @@ -102,13 +102,13 @@ public VersionDocumentsTab enterFilePath(String filePath) { public VersionDocumentsTab submitUpload() { log.info("Click Submit upload"); - readyElement(startUploadButton).click(); + clickElement(startUploadButton); return new VersionDocumentsTab(getDriver()); } public VersionDocumentsTab clickUploadDone() { log.info("Click upload Done button"); - readyElement(fileUploadDone).click(); + clickElement(fileUploadDone); return new VersionDocumentsTab(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java b/functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java index 810e795e23..5ac798ea12 100644 --- a/functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java +++ b/functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java @@ -62,7 +62,7 @@ public ContactAdminFormPage inputMessage(String message) { */ public

P send(Class

pageClass) { log.info("Click Send"); - readyElement(sendButton).click(); + clickElement(sendButton); return PageFactory.initElements(getDriver(), pageClass); } } diff --git a/functional-test/src/main/java/org/zanata/page/utility/HomePage.java b/functional-test/src/main/java/org/zanata/page/utility/HomePage.java index 6b2981ffd3..10d5a887d8 100644 --- a/functional-test/src/main/java/org/zanata/page/utility/HomePage.java +++ b/functional-test/src/main/java/org/zanata/page/utility/HomePage.java @@ -43,7 +43,7 @@ public HomePage(final WebDriver driver) { public EditHomeContentPage goToEditPageContent() { log.info("Click Edit Page Content"); - readyElement(editPageContentButton).click(); + clickElement(editPageContentButton); return new EditHomeContentPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java b/functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java index 0592669c0f..bc17828c5c 100644 --- a/functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java +++ b/functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java @@ -48,7 +48,7 @@ public List> getDocumentListTableContent() { public EditorPage clickDocumentLink(String path, String name) { String id = "gwt-debug-docLabel-" + path + name; - readyElement(By.id(id)).click(); + clickElement(By.id(id)); return new EditorPage(getDriver()); } diff --git a/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java b/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java index 56641963c2..47e6b518bd 100644 --- a/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java +++ b/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java @@ -92,7 +92,7 @@ public boolean apply(WebDriver input) { }); readyElement(glossarySearchInput).clear(); readyElement(glossarySearchInput).sendKeys(term); - readyElement(By.id("gwt-debug-glossarySearchButton")).click(); + clickElement(By.id("gwt-debug-glossarySearchButton")); return new EditorPage(getDriver()); }