Holly made multiple changes while testing RC3.

utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html

@@ -101,7 +101,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Locations (313)</td>
+	<td>link=Locations (314)</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -201,7 +201,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -271,7 +271,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -336,7 +336,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -401,7 +401,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -466,7 +466,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -531,7 +531,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -601,7 +601,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -661,7 +661,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -731,7 +731,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -796,7 +796,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -861,7 +861,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -926,7 +926,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -991,7 +991,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1061,7 +1061,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1126,7 +1126,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1196,7 +1196,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1261,7 +1261,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1326,7 +1326,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1391,7 +1391,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1456,7 +1456,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1521,7 +1521,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1586,7 +1586,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1656,7 +1656,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1786,7 +1786,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1856,7 +1856,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -1931,7 +1931,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -2001,7 +2001,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -2039,6 +2039,76 @@
 	<td>Index of Contents</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Address</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Address</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=1234 Northern African Nation</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>1234 Northern African Nation</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='Edit This Individual']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Editing Form</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>name=_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>clickAndWait</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index of Contents</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Do some pausing and refreshing</td>

utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html

@@ -244,6 +244,11 @@
 	<td>submit-Add</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Default Menu</td>
@@ -319,6 +324,11 @@
 	<td>submit-Add</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Default Menu</td>
@@ -399,6 +409,11 @@
 	<td>submit-Add</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Default Menu</td>
@@ -641,7 +656,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/ul/li[5]/span/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]/span/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -661,7 +676,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/ul/li[5]/span/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]/span/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -681,7 +696,27 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/ul/li[5]/span/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]/span/a[2]/img</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Remove Menu Item</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>removeMenuItem</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Default Menu</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]/span/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html

@@ -219,11 +219,6 @@
 	<td>Primate Research Laboratory Campus</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>http://primatehealthintro.cornell.edu Webpage</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Elderly Care Subject Area</td>
@@ -244,6 +239,11 @@
 	<td>Primate Research Lab Room 123 Facility</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Jane Memorial Building Building</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=2</td>
@@ -254,6 +254,11 @@
 	<td>primates - VIVO Search Results</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>http://primatehealthintro.cornell.edu Webpage</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>PHC Proceedings Proceedings</td>
@@ -264,11 +269,6 @@
 	<td>Librarian, Lily Assistant Librarian</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Jane Memorial Building Building</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Liberia Country</td>

utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html

@@ -142,7 +142,7 @@
 <tr>
 	<td>type</td>
 	<td>relatedIndLabel</td>
-	<td>Future</td>
+	<td>Future of</td>
 </tr>
 <tr>
 	<td>click</td>
@@ -212,7 +212,7 @@
 <tr>
 	<td>type</td>
 	<td>relatedIndLabel</td>
-	<td>Nix</td>
+	<td>Nix N</td>
 </tr>
 <tr>
 	<td>click</td>
@@ -272,7 +272,7 @@
 <tr>
 	<td>type</td>
 	<td>relatedIndLabel</td>
-	<td>Nix</td>
+	<td>Nix N</td>
 </tr>
 <tr>
 	<td>click</td>

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

@@ -236,7 +236,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Replace image for Faculty, Jane</td>
+	<td>Crop Photo for Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -1461,7 +1461,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=&quot;Edit this individual&quot;</td>
+	<td>link=Edit this individual</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -59,11 +59,6 @@
 	<td>link=people</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=research</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Faculty, Jane</td>
@@ -74,16 +69,6 @@
 	<td>Faculty, Jane Assistant Professor</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Primatia</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primatia Subject Area</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Search for Jane Faculty's last name only</td>
@@ -109,11 +94,6 @@
 	<td>link=people</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=research</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Faculty, Jane</td>
@@ -124,16 +104,6 @@
 	<td>Faculty, Jane Assistant Professor</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Primatia</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primatia Subject Area</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Search for Jane Faculty's full name</td>
@@ -159,11 +129,6 @@
 	<td>link=people</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=research</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Faculty, Jane</td>
@@ -174,16 +139,6 @@
 	<td>Faculty, Jane Assistant Professor</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Primatia</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primatia Subject Area</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Search for Lily Librarian's first name only</td>

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

@@ -281,6 +281,11 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
+	<td>Upload image for Faculty, Jane</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
 	<td>Photo Upload</td>
 	<td></td>
 </tr>

utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html

@@ -310,8 +310,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>assertTitle</td>
+	<td>verifyTextNotPresent</td>
-	<td>carroll college - VIVO Search Results</td>
+	<td>Carroll College</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>No matching results.</td>
 	<td></td>
 </tr>
 <tr>
@@ -470,13 +475,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>assertTitle</td>
+	<td>verifyTextNotPresent</td>
-	<td>carroll university - VIVO Search Results</td>
+	<td>Carroll University</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextNotPresent</td>
+	<td>verifyTextPresent</td>
-	<td>Carroll University</td>
+	<td>No matching results.</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html

@@ -139,6 +139,11 @@
 	<td>Research</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Events</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Activities</td>
@@ -159,11 +164,6 @@
 	<td>Locations</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Events</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Delete new menu items</td>
@@ -171,7 +171,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/ul/li[5]/span/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]/span/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -216,7 +216,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/ul/li[5]/span/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]/span/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -236,7 +236,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/ul/li[5]/span/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]/span/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -256,7 +256,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/ul/li[5]/span/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]/span/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -276,7 +276,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/ul/li[5]/span/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]/span/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html

@@ -296,7 +296,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>activities Change content type</td>
+	<td>Change content type</td>
 	<td></td>
 </tr>
 <tr>