Holly made remaining test suite changes due to page title change upon login.

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

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

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

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

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

@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</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>

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

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

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

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

utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html

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

utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html

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

utilities/acceptance-tests/suites/CustomEducationFormVB/CreateTestFacultyMember.html

@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</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>

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

@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -241,12 +241,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>carroll college</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -306,12 +306,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>carroll college</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -326,12 +326,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>wisconsin</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -391,12 +391,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>wisconsin</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -411,12 +411,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>illinois</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -476,12 +476,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>illinois</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>

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

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

utilities/acceptance-tests/suites/CustomEducationFormVB/SearchEducationBackground.html

@@ -56,12 +56,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>carroll college</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -76,12 +76,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>wisconsin</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -96,12 +96,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>illinois</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html

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

utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html

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

utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html

@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</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>

utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html

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

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

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

utilities/acceptance-tests/suites/CustomPositionsFormVB/AddPositions.html

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

utilities/acceptance-tests/suites/CustomPositionsFormVB/ChangePositions.html

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

utilities/acceptance-tests/suites/CustomPositionsFormVB/CreateTestFacultyMember.html

@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</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>

utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html

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

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

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

utilities/acceptance-tests/suites/CustomPositionsFormVB/SearchPositions.html

@@ -56,12 +56,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>lecturer</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -121,12 +121,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>professor</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -186,12 +186,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>carroll</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -246,12 +246,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>carroll</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -296,12 +296,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>university</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>