Holly is changing the tests for the vivo-basic theme.

utilities/acceptance-tests/suites/AdminSecurityVB/AdminBadLogin.html

@@ -56,7 +56,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -81,7 +81,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -111,7 +111,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -126,7 +126,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=VIVO</td>
+	<td>link=Home</td>
 	<td></td>
 </tr>
 <tr>
@@ -134,7 +134,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

utilities/acceptance-tests/suites/AdminSecurityVB/AdminBookmarkedPage.html

@@ -46,7 +46,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -56,7 +56,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=VIVO</td>
+	<td>link=Home</td>
 	<td></td>
 </tr>
 <tr>
@@ -64,7 +64,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

utilities/acceptance-tests/suites/AdminSecurityVB/AdminChangePassword.html

@@ -55,13 +55,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>assertTitle</td>
+	<td>verifyTextPresent</td>
-	<td>VIVO Site Administration</td>
+	<td>Log in</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>assertTitle</td>
-	<td>Log in</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -89,6 +89,16 @@
 	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>testAdmin</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Log out</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Site Administration</td>
@@ -109,11 +119,6 @@
 	<td>User Accounts</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>testAdmin</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=testAdmin</td>
@@ -209,6 +214,11 @@
 	<td>User Account Control Panel</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -231,7 +241,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -251,7 +261,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -339,6 +349,11 @@
 	<td class="comment">Logout</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -354,7 +369,6 @@
 	<td>Log in</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html

@@ -56,7 +56,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Logged in as testAdmin (Log out)</td>
+	<td>testAdmin</td>
 	<td></td>
 </tr>
 <tr>
@@ -99,12 +99,16 @@
 	<td class="comment">Logout</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminAccount.html

@@ -199,6 +199,11 @@
 	<td class="comment">Log out</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -209,7 +214,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminDelete.html

@@ -169,6 +169,11 @@
 	<td class="comment">Logout</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -179,7 +184,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminFirstLogin.html

@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -96,7 +96,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Email or Username</td>
+	<td>Email</td>
 	<td></td>
 </tr>
 <tr>
@@ -126,7 +126,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -161,7 +161,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,12 +171,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Create Your New Password</td>
+	<td>New Password</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Password</td>
 	<td></td>
 </tr>
 <tr>
@@ -211,7 +206,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -236,7 +231,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -311,7 +306,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -376,7 +371,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Logged in as Sis Admin (Log out)</td>
+	<td>Sis Admin</td>
 	<td></td>
 </tr>
 <tr>
@@ -409,12 +404,16 @@
 	<td>link=Log out</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>