Holly made final login changes to this suite.

utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html

@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>Connie Curator</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>newPassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
@@ -121,7 +121,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>link=Log out</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html

@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>Eddie Editor</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>newPassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
@@ -121,7 +121,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>link=Log out</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html

@@ -34,11 +34,6 @@
 	<td></td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">First-time Curator login</td>
-	<td></td>
-</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
@@ -51,7 +46,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Login for the first time</td>
+	<td class="comment">Must not be logged in already</td>
 	<td></td>
 </tr>
 <tr>
@@ -64,34 +59,9 @@
 	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Log in</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Try no password</td>
+	<td class="comment">Try logging in with wrong password</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>loginName</td>
-	<td>Connie Curator</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>loginPassword</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>loginForm</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Try the wrong password</td>
 	<td></td>
 </tr>
 <tr>
@@ -114,11 +84,6 @@
 	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Log in</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>The email or password you entered is incorrect.</td>
@@ -126,7 +91,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Now the correct password</td>
+	<td class="comment">Login with correct password</td>
 	<td></td>
 </tr>
 <tr>
@@ -149,6 +114,11 @@
 	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Now it's time to change the password</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Create Your New Password</td>
@@ -161,7 +131,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Try changing to an invalid password</td>
+	<td class="comment">Try an invalid password</td>
 	<td></td>
 </tr>
 <tr>
@@ -180,18 +150,43 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>assertAlert</td>
-	<td>Create Your New Password</td>
+	<td>Please enter a password between 5 and 99 characters long</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Please enter a password with more than 5 characters</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Now try a valid password, but not the same on in each box</td>
+	<td class="comment">Try using the original password as the new one</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>newPassword</td>
+	<td>myPassword</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
+	<td>myPassword</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>passwordChangeForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please choose a different password from the temporary one provided initially.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Try using 2 different passwords</td>
 	<td></td>
 </tr>
 <tr>
@@ -209,11 +204,6 @@
 	<td>passwordChangeForm</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
 <tr>
 	<td>assertAlert</td>
 	<td>Passwords do not match</td>
@@ -221,7 +211,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Now try a valid password</td>
+	<td class="comment">Change password correctly</td>
 	<td></td>
 </tr>
 <tr>
@@ -235,7 +225,7 @@
 	<td>newPassword</td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>passwordChangeForm</td>
 	<td></td>
 </tr>
@@ -246,17 +236,17 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Are we logged in?</td>
+	<td class="comment">Verify that account is logged in</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Logged in as Connie Curator</td>
+	<td>Logged in as Connie Curator (Log out)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Logout</td>
+	<td class="comment">Log out</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html

@@ -34,11 +34,6 @@
 	<td></td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">First-time Editor login</td>
-	<td></td>
-</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
@@ -51,7 +46,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Login for the first time</td>
+	<td class="comment">Must not be logged in already</td>
 	<td></td>
 </tr>
 <tr>
@@ -66,22 +61,22 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Try the wrong password</td>
+	<td class="comment">Try logging in with wrong password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>Eddie Editor</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>incorrect</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
@@ -91,27 +86,27 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>(1st login; initial password entered incorrectly)</td>
+	<td>The email or password you entered is incorrect.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Please try entering provided password again</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Now the correct password</td>
+	<td class="comment">Login with correct password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginName</td>
+	<td>Eddie Editor</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>loginPassword</td>
 	<td>myPassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
@@ -120,108 +115,118 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>comment</td>
-	<td>(1st login; changing to new private password)</td>
+	<td class="comment">Now it's time to change the password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Please now choose a private password</td>
+	<td>Create Your New Password</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please enter a password with more than 5 characters</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Try changing to an invalid password</td>
+	<td class="comment">Try an invalid password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>newPassword</td>
+	<td>junk</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
 	<td>junk</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>loginSubmitMode</td>
+	<td>passwordChangeForm</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertAlert</td>
-	<td>Please enter a password between 6 and 12 characters long</td>
+	<td>Please enter a password between 5 and 99 characters long</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Now try a valid one</td>
+	<td class="comment">Try using the original password as the new one</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>newPassword</td>
+	<td>myPassword</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
+	<td>myPassword</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>passwordChangeForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please choose a different password from the temporary one provided initially.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Try using 2 different passwords</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>newPassword</td>
+	<td>newPassword</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
+	<td>newPasword</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>passwordChangeForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertAlert</td>
+	<td>Passwords do not match</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Change password correctly</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>newPassword</td>
+	<td>newPassword</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
 	<td>newPassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>passwordChangeForm</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>(changing to new password)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Please re-enter new private password</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Re-enter it incorrectly</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>garbage</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>(password incorrect)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Incorrect password: try again</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Now re-enter it correctly</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>newPassword</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
 	<td></td>
 </tr>
 <tr>
@@ -231,17 +236,12 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Are we logged in?</td>
+	<td class="comment">Verify that account is logged in</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Logged in as</td>
+	<td>Logged in as Eddie Editor (Log out)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Eddie Editor</td>
 	<td></td>
 </tr>
 <tr>
@@ -251,7 +251,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>link=Log out</td>
 	<td></td>
 </tr>
 <tr>