Holly made some more test case changes...

utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html

@@ -109,6 +109,16 @@
 	<td>Site Admin</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>link=My profile</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Verify available options</td>

utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html

@@ -379,6 +379,16 @@
 	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>link=My profile</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">log out</td>

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

@@ -120,7 +120,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyElementPresent</td>
+	<td>verifyElementNotPresent</td>
 	<td>link=Institutional internal class</td>
 	<td></td>
 </tr>
@@ -249,41 +249,6 @@
 	<td class="comment">Check links actually work</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Institutional internal class</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextNotPresent</td>
-	<td>We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Site Admin</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Site Admin</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Site information</td>

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

@@ -254,6 +254,16 @@
 	<td>link=Log out</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>link=My profile</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Log out</td>

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

@@ -254,6 +254,16 @@
 	<td>link=Log out</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>link=My profile</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Log out</td>

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

@@ -254,6 +254,16 @@
 	<td>You have logged in, but the system contains no profile for you.</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>link=My profile</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Log out</td>

utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html

@@ -254,6 +254,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>

utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html

@@ -159,6 +159,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>

utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html

@@ -89,24 +89,29 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=People</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>People</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Navigate to Jane Faculty</td>
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
-	<td>link=Person (2)</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index of Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty Member</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html

@@ -119,6 +119,11 @@
 	<td class="comment">Verify 3 user accounts exist before trying to delete them</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>9 accounts</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=EddieEditor@cornell.edu</td>
@@ -149,16 +154,6 @@
 	<td>name=deleteAccount</td>
 	<td></td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>//input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u4845']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>//input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u4682']</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>name=delete-account</td>
@@ -171,7 +166,67 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Deleted 3 accounts.</td>
+	<td>8 accounts</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>name=deleteAccount</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>name=delete-account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you sure you want to delete this account?</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>7 accounts</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>name=deleteAccount</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>name=delete-account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you sure you want to delete this account?</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>6 accounts</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html

@@ -30,7 +30,7 @@
 <tr><td rowspan="1" colspan="3" class="testName">ValidateAdminProxy2</td></tr>
 </thead><tbody>
 <tr>
-	<td>deleteAllVisibleCookiesAndWait</td>
+	<td>deleteAllVisibleCookies</td>
 	<td></td>
 	<td></td>
 </tr>

utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html

@@ -546,19 +546,19 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Check My profile</td>
+	<td class="comment">Check My options </td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>link=My profile</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Faculty, Jane</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Logout</td>

utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html

@@ -30,7 +30,7 @@
 <tr><td rowspan="1" colspan="3" class="testName">ValidateAdminProxy2</td></tr>
 </thead><tbody>
 <tr>
-	<td>deleteAllVisibleCookiesAndWait</td>
+	<td>deleteAllVisibleCookies</td>
 	<td></td>
 	<td></td>
 </tr>
@@ -299,6 +299,16 @@
 	<td>You have logged in, but the system contains no profile for you.</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>link=My profile</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Index</td>
@@ -509,6 +519,16 @@
 	<td>You have logged in, but the system contains no profile for you.</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>link=My profile</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Index</td>
@@ -521,12 +541,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Faculty</td>
+	<td>link=Faculty Member</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Faculty</td>
+	<td>Faculty Member</td>
 	<td></td>
 </tr>
 <tr>
@@ -709,6 +729,41 @@
 	<td>link=Remove selection</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=My profile</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty, Jane</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Faculty, Jane</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>css=img.delete-individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>id=submit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty, Jane</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Logout</td>

utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html

@@ -30,7 +30,7 @@
 <tr><td rowspan="1" colspan="3" class="testName">ValidateAdminProxy2</td></tr>
 </thead><tbody>
 <tr>
-	<td>deleteAllVisibleCookiesAndWait</td>
+	<td>deleteAllVisibleCookies</td>
 	<td></td>
 	<td></td>
 </tr>
@@ -200,10 +200,45 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>verifyElementNotPresent</td>
 	<td>link=My profile</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index of Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Faculty, Jane</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty, Jane</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Faculty, Jane</td>
@@ -250,10 +285,40 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>verifyElementNotPresent</td>
 	<td>link=My profile</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index of Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Faculty, Jane</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Faculty, Jane</td>
@@ -299,6 +364,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>link=My profile</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=My account</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Site Admin</td>