Holly made changes due to ontology modifications and teaching moving to a role.

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

@@ -190,13 +190,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>click</td>
-	<td>link=Faculty</td>
+	<td>link=Faculty Member (1)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Faculty</td>
+	<td>People</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -254,41 +254,6 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@id='teaches']/a</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@id='submit' and @value='add a new item to this list']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>name</td>
-	<td>Advanced Primates 301</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='adviseeIn']/a</td>
@@ -664,26 +629,6 @@
 	<td>Advising Relationship</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Advanced Primates 301</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Intermediate Primates 201</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>I teach apes how to communicate with humans.</td>

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

@@ -106,12 +106,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Faculty</td>
+	<td>link=Faculty Member (1)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Faculty</td>
+	<td>People</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -106,22 +106,22 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Librarians</td>
+	<td>Librarian</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Librarians</td>
+	<td>link=Librarian (1)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Librarians</td>
+	<td>People</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Librarians</td>
+	<td>Librarian</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -534,26 +534,6 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@id='firstName']/div/div/span/span/a[2]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></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='middleName']/div/div/span/span/a[2]</td>
@@ -1069,26 +1049,6 @@
 	<td>Advising Relationship</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementNotPresent</td>
-	<td>link=Advanced Primates 301</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextNotPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementNotPresent</td>
-	<td>link=Intermediate Primates 201</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextNotPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>I teach apes how to communicate with humans.</td>

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

@@ -359,41 +359,6 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@id='teaches']/ul/li/span/span/a[1]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@id='submit' and @value='add a new item to this list']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>name</td>
-	<td>Intermediate Primates 201</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='teachingOverview']/div/div/span/span/a[1]</td>
@@ -914,16 +879,6 @@
 	<td>Advising Relationship</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Intermediate Primates 201</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>I teach apes how to communicate with humans.</td>

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

@@ -199,26 +199,6 @@
 	<td>Advising Relationship</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Advanced Primates 301</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Intermediate Primates 201</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>I teach apes how to communicate with humans.</td>

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

@@ -189,41 +189,6 @@
 	<td>link=people</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=courses</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Introduction to Primates 101</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Intermediate Primates 201</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Advanced Primates 301</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Semester Class</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Faculty, Jane</td>