Holly did some more test changes...

utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html

@@ -161,7 +161,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>5000</td>
+	<td>10000</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html

@@ -571,7 +571,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>5000</td>
+	<td>10000</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddPublications/SearchPublications.html

@@ -424,51 +424,6 @@
 	<td>Nintendo O.K. for Kids</td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Search for PUBLISHER</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>querytext</td>
-	<td>publisher</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Search']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>publisher - VIVO Search Results</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=organizations</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Putnam</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Putnam</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Marcel Dekker</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Marcel Dekker</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Search for CONFERENCE</td>

utilities/acceptance-tests/suites/AddPublications/ValidateFields.html

@@ -544,11 +544,6 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>This field must not be empty.</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Edit</td>

utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html

@@ -1609,6 +1609,76 @@
 	<td>VIVO Site Administration</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=Event</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Event</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Show Me the Primates!</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Show Me the Primates!</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Edit this individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Control Panel</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Editing Form</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>_delete</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you SURE you want to delete this individual? If in doubt, CANCEL.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Verify everything is gone</td>

utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html

@@ -156,7 +156,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>5000</td>
+	<td>10000</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html

@@ -156,7 +156,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>5000</td>
+	<td>10000</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html

@@ -206,12 +206,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Habitats for Apes Grant</td>
+	<td>Faculty, Jane Assistant Professor</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Introduction to the Ape World Course</td>
+	<td>Habitats for Apes Grant</td>
 	<td></td>
 </tr>
 <tr>
@@ -221,7 +221,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>History of Apes in Africa Project</td>
+	<td>Introduction to the Ape World Course</td>
 	<td></td>
 </tr>
 <tr>
@@ -231,7 +231,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Faculty, Jane Assistant Professor</td>
+	<td>History of Apes in Africa Project</td>
 	<td></td>
 </tr>
 <tr>
@@ -309,6 +309,11 @@
 	<td>Working with Primates Workshop</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primates of the World Museum</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Researching Primates Presentation</td>
@@ -319,11 +324,6 @@
 	<td>Show Me the Primates! Event</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primates of the World Museum</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Librarians for the Better Treatment of Primates Committee</td>

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

@@ -149,11 +149,6 @@
 	<td>Index of Contents</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Faculty Member</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Is association gone?</td>

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

@@ -81,7 +81,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primatia Subject Area </td>
+	<td>Primatia Subject Area</td>
 	<td></td>
 </tr>
 <tr>
@@ -124,16 +124,6 @@
 	<td>Faculty, Jane Assistant Professor</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Librarian, Lily</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Librarian, Lily Assistant Librarian</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Primatia</td>
@@ -141,7 +131,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primatia Subject Area </td>
+	<td>Primatia Subject Area</td>
 	<td></td>
 </tr>
 <tr>
@@ -191,7 +181,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primatia Subject Area </td>
+	<td>Primatia Subject Area</td>
 	<td></td>
 </tr>
 <tr>