diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html index 03eeb715..1f074f74 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html @@ -61,7 +61,7 @@ type - username + loginName testAdmin @@ -71,12 +71,12 @@ type - password + loginPassword incorrect clickAndWait - loginSubmitMode + loginForm @@ -86,7 +86,7 @@ verifyTextPresent - Incorrect password: try again + The email or password you entered is incorrect. @@ -96,17 +96,17 @@ type - username + loginName testAdm type - password + loginPassword Password clickAndWait - loginSubmitMode + loginForm @@ -114,21 +114,16 @@ VIVO Site Administration + + verifyTextPresent + The email or password you entered is incorrect. + + comment Never logged in correctly - - verifyTextPresent - Unknown username - - - - verifyTextPresent - Incorrect password: try again - - clickAndWait link=VIVO diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html index 1a6eb923..0939e461 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html @@ -51,7 +51,7 @@ verifyTextPresent - Please log in + Log in diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html index 15cdac09..b8deb9ce 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html @@ -61,7 +61,7 @@ verifyTextPresent - Please log in + Log in @@ -71,17 +71,17 @@ type - username + loginName testAdmin type - password + loginPassword Password clickAndWait - loginSubmitMode + loginForm @@ -211,17 +211,17 @@ type - username + loginName testAdmin type - password + loginPassword Password2 clickAndWait - loginSubmitMode + loginForm diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html index 2d99f25d..e2f854f6 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html @@ -36,7 +36,7 @@ comment - Logout Both Ways and Check Security + Logout and Check Security--more meaningul when there used to be two ways to logout @@ -59,71 +59,11 @@ VIVO Site Administration - - verifyTextPresent - Please log in - - - - comment - Login then logout from site admin button - - - - type - username - testAdmin - - - type - password - Password - - - clickAndWait - loginSubmitMode - - - - assertTitle - VIVO Site Administration - - - - verifyTextPresent - Logged in as - - - - clickAndWait - loginSubmitMode - - - - assertTitle - VIVO - - verifyTextPresent Log in - - clickAndWait - link=Log in - - - - assertTitle - VIVO Site Administration - - - - verifyTextPresent - Please log in - - comment Login then logout using login link @@ -131,17 +71,17 @@ type - username + loginName testAdmin type - password + loginPassword Password clickAndWait - loginSubmitMode + loginForm diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html index 1956bb71..f11145b5 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html @@ -66,17 +66,17 @@ type - username + loginName testAdmin type - password + loginPassword Password clickAndWait - loginSubmitMode + loginForm diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html index f9c8e5f4..3ed67b78 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html @@ -66,22 +66,17 @@ type - username + loginName testAdmin type - password + loginPassword Password - - assertTitle - VIVO Site Administration - - clickAndWait - loginSubmitMode + loginForm diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html index 3824aaec..9179a586 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html @@ -71,17 +71,17 @@ type - username + loginName Sis Admin type - password + loginPassword myPassword clickAndWait - loginSubmitMode + loginForm @@ -96,12 +96,12 @@ verifyTextPresent - (1st login; changing to new private password) + Create Your New Password verifyTextPresent - Please now choose a private password + Please enter a password with more than 5 characters @@ -111,12 +111,17 @@ type - password + newPassword + myPassword + + + type + confirmPassword myPassword clickAndWait - loginSubmitMode + passwordChangeForm @@ -131,67 +136,37 @@ verifyTextPresent - (1st login; changing to new private password) + Create Your New Password verifyTextPresent - Please pick a different password from the one provided initially + Please choose a different password from the temporary one provided initially. + + + + verifyTextPresent + Please enter a password with more than 5 characters comment - Type in a different new password + Type in a different new password, mispelling the confirmation password type - password + newPassword newPassword - - clickAndWait - loginSubmitMode - - - - verifyTextPresent - (changing to new password) - - - - verifyTextPresent - Please re-enter new private password - - - - assertTitle - VIVO Site Administration - - - - comment - Type in wrong spelling on confirmation - - type - password + confirmPassword newPasword clickAndWait - loginSubmitMode - - - - verifyTextPresent - (password incorrect) - - - - verifyTextPresent - Incorrect password: try again + passwordChangeForm @@ -199,6 +174,16 @@ VIVO Site Administration + + comment + Rejected due to type in confirmed password + + + + verifyTextPresent + + + comment Successfully type in new password for a second time @@ -206,12 +191,17 @@ type - password + newPassword + newPassword + + + type + confirmPassword newPassword clickAndWait - loginSubmitMode + passwordChangeForm @@ -224,6 +214,11 @@ Log in accepted + + verifyTextPresent + Logged in as Sis Admin + + verifyTextPresent Data Input