Holly made changes to test due to theme and ontology changes.

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

@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -105,8 +105,23 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>verifyElementPresent</td>
-	<td>Faculty</td>
+	<td>link=People</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Faculty</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Librarians</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Academic Staff</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -264,31 +264,6 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@id='internationalGeographicFocus']/a</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>objectVar</td>
-	<td>label=Africa</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Faculty, Jane</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//div[@id='hasResearchArea']/a</td>
@@ -319,6 +294,31 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//div[@id='geographicFocus']/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>objectVar</td>
+	<td>label=Africa</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>submit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty, Jane</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//div[@id='advisorIn']/a</td>
@@ -476,7 +476,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='awardOrDistinction']/a</td>
+	<td>//div[@id='awardOrHonor']/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
@@ -581,7 +586,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='workEmail']/a</td>
+	<td>//div[@id='email']/a</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -166,7 +166,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='internationalGeographicFocus']/a</td>
+	<td>//div[@id='geographicFocus']/a</td>
 	<td></td>
 </tr>
 <tr>
@@ -326,7 +326,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='awardOrDistinction']/a</td>
+	<td>//div[@id='awardOrHonor']/a</td>
 	<td></td>
 </tr>
 <tr>
@@ -406,7 +406,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='workEmail']/a</td>
+	<td>//div[@id='email']/a</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -66,7 +66,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -187,7 +187,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -247,7 +247,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>

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

@@ -66,7 +66,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -172,7 +172,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily2.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\lily2.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -222,7 +222,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily2.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\lily2.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -282,7 +282,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily2.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\lily2.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -352,7 +352,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily3.png</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\lily3.png</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -402,7 +402,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily4.gif</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\lily4.gif</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>

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

@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -261,7 +261,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='internationalGeographicFocus']/ul/li/span/span/a[1]</td>
+	<td>//div[@id='geographicFocus']/ul/li/span/span/a[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -481,7 +481,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='awardOrDistinction']/ul/li/span/span/a[1]</td>
+	<td>//div[@id='awardOrHonor']/ul/li/span/span/a[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -641,7 +641,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='workEmail']/div/div/span/span/a[1]</td>
+	<td>//div[@id='email']/div/div/span/span/a[1]</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -66,12 +66,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>monkey</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -79,6 +79,11 @@
 	<td>monkey - VIVO Search Results</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=people</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=topics</td>
@@ -101,7 +106,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Award or Honor</td>
+	<td>Award or Honor Receipt</td>
 	<td></td>
 </tr>
 <tr>
@@ -111,12 +116,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>ape</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -151,7 +156,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Award or Honor</td>
+	<td>Award or Honor Receipt</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,12 +176,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>primate</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -241,12 +246,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>chimp</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -281,7 +286,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Award or Honor</td>
+	<td>Award or Honor Receipt</td>
 	<td></td>
 </tr>
 <tr>
@@ -301,12 +306,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>tarzan</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -336,12 +341,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>queen</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -371,12 +376,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>mozambique</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -516,12 +521,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>human</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -569,7 +574,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

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

@@ -56,7 +56,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -66,7 +66,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -287,7 +287,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane1.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane1.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -397,7 +397,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane1.jpg</td>
+	<td>C:\VIVO\\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane1.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>

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

@@ -66,7 +66,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -272,7 +272,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily1.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\lily1.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -327,7 +327,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lilysmall.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\lilysmall.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -367,7 +367,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lilylarge.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\lilylarge.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -412,7 +412,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily1.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\lily1.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>