diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html index 2fbaad05..b1d5a323 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html @@ -71,17 +71,17 @@ type - username + loginName Connie Curator type - password + loginPassword newPassword clickAndWait - loginSubmitMode + loginForm @@ -121,7 +121,7 @@ clickAndWait - loginSubmitMode + link=Log out diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html index 4b65a823..c5be234d 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html @@ -71,17 +71,17 @@ type - username + loginName Eddie Editor type - password + loginPassword newPassword clickAndWait - loginSubmitMode + loginForm @@ -121,7 +121,7 @@ clickAndWait - loginSubmitMode + link=Log out diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html index 70fa342c..c62b7c8e 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html @@ -34,11 +34,6 @@ - - comment - First-time Curator login - - open /vivo/ @@ -51,7 +46,7 @@ comment - Login for the first time + Must not be logged in already @@ -64,34 +59,9 @@ VIVO Site Administration - - verifyTextPresent - Log in - - comment - Try no password - - - - type - loginName - Connie Curator - - - type - loginPassword - - - - click - loginForm - - - - comment - Try the wrong password + Try logging in with wrong password @@ -114,11 +84,6 @@ VIVO Site Administration - - verifyTextPresent - Log in - - verifyTextPresent The email or password you entered is incorrect. @@ -126,7 +91,7 @@ comment - Now the correct password + Login with correct password @@ -149,6 +114,11 @@ VIVO Site Administration + + comment + Now it's time to change the password + + verifyTextPresent Create Your New Password @@ -161,7 +131,7 @@ comment - Try changing to an invalid password + Try an invalid password @@ -180,18 +150,43 @@ - verifyTextPresent - Create Your New Password - - - - verifyTextPresent - Please enter a password with more than 5 characters + assertAlert + Please enter a password between 5 and 99 characters long comment - Now try a valid password, but not the same on in each box + Try using the original password as the new one + + + + type + newPassword + myPassword + + + type + confirmPassword + myPassword + + + clickAndWait + passwordChangeForm + + + + assertTitle + VIVO Site Administration + + + + verifyTextPresent + Please choose a different password from the temporary one provided initially. + + + + comment + Try using 2 different passwords @@ -209,11 +204,6 @@ passwordChangeForm - - assertTitle - VIVO Site Administration - - assertAlert Passwords do not match @@ -221,7 +211,7 @@ comment - Now try a valid password + Change password correctly @@ -235,7 +225,7 @@ newPassword - click + clickAndWait passwordChangeForm @@ -246,17 +236,17 @@ comment - Are we logged in? + Verify that account is logged in verifyTextPresent - Logged in as Connie Curator + Logged in as Connie Curator (Log out) comment - Logout + Log out diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html index 45da7d5e..ac940fcc 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html @@ -34,11 +34,6 @@ - - comment - First-time Editor login - - open /vivo/ @@ -51,7 +46,7 @@ comment - Login for the first time + Must not be logged in already @@ -66,22 +61,22 @@ comment - Try the wrong password + Try logging in with wrong password type - username + loginName Eddie Editor type - password + loginPassword incorrect clickAndWait - loginSubmitMode + loginForm @@ -91,27 +86,27 @@ verifyTextPresent - (1st login; initial password entered incorrectly) - - - - verifyTextPresent - Please try entering provided password again + The email or password you entered is incorrect. comment - Now the correct password + Login with correct password type - password + loginName + Eddie Editor + + + type + loginPassword myPassword clickAndWait - loginSubmitMode + loginForm @@ -120,108 +115,118 @@ - verifyTextPresent - (1st login; changing to new private password) + comment + Now it's time to change the password verifyTextPresent - Please now choose a private password + Create Your New Password + + + + verifyTextPresent + Please enter a password with more than 5 characters comment - Try changing to an invalid password + Try an invalid password type - password + newPassword + junk + + + type + confirmPassword junk click - loginSubmitMode + passwordChangeForm assertAlert - Please enter a password between 6 and 12 characters long + Please enter a password between 5 and 99 characters long comment - Now try a valid one + Try using the original password as the new one type - password + newPassword + myPassword + + + type + confirmPassword + myPassword + + + clickAndWait + passwordChangeForm + + + + assertTitle + VIVO Site Administration + + + + verifyTextPresent + Please choose a different password from the temporary one provided initially. + + + + comment + Try using 2 different passwords + + + + type + newPassword + newPassword + + + type + confirmPassword + newPasword + + + click + passwordChangeForm + + + + assertAlert + Passwords do not match + + + + comment + Change password correctly + + + + type + newPassword + newPassword + + + type + confirmPassword newPassword clickAndWait - loginSubmitMode - - - - assertTitle - VIVO Site Administration - - - - verifyTextPresent - (changing to new password) - - - - verifyTextPresent - Please re-enter new private password - - - - comment - Re-enter it incorrectly - - - - type - password - garbage - - - clickAndWait - loginSubmitMode - - - - assertTitle - VIVO Site Administration - - - - verifyTextPresent - (password incorrect) - - - - verifyTextPresent - Incorrect password: try again - - - - comment - Now re-enter it correctly - - - - type - password - newPassword - - - clickAndWait - loginSubmitMode + passwordChangeForm @@ -231,17 +236,12 @@ comment - Are we logged in? + Verify that account is logged in verifyTextPresent - Logged in as - - - - verifyTextPresent - Eddie Editor + Logged in as Eddie Editor (Log out) @@ -251,7 +251,7 @@ clickAndWait - loginSubmitMode + link=Log out