diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminBadLogin.html b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminBadLogin.html index 1f074f74..96f77d58 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminBadLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminBadLogin.html @@ -56,7 +56,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -81,7 +81,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -111,7 +111,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -126,7 +126,7 @@ clickAndWait - link=VIVO + link=Home @@ -134,7 +134,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminBookmarkedPage.html b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminBookmarkedPage.html index 0939e461..641fcf2c 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminBookmarkedPage.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminBookmarkedPage.html @@ -46,7 +46,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -56,7 +56,7 @@ clickAndWait - link=VIVO + link=Home @@ -64,7 +64,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminChangePassword.html b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminChangePassword.html index ed4cced8..e40ceef2 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminChangePassword.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminChangePassword.html @@ -55,13 +55,13 @@ - assertTitle - VIVO Site Administration + verifyTextPresent + Log in - verifyTextPresent - Log in + assertTitle + VIVO @@ -89,6 +89,16 @@ VIVO Site Administration + + verifyTextPresent + testAdmin + + + + verifyElementPresent + link=Log out + + verifyTextPresent Site Administration @@ -109,11 +119,6 @@ User Accounts - - verifyTextPresent - testAdmin - - clickAndWait link=testAdmin @@ -209,6 +214,11 @@ User Account Control Panel + + clickAndWait + link=Home + + clickAndWait link=Log out @@ -231,7 +241,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -251,7 +261,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -339,6 +349,11 @@ Logout + + clickAndWait + link=Home + + clickAndWait link=Log out @@ -354,7 +369,6 @@ Log in - diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html index e2f854f6..a37c504b 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html @@ -56,7 +56,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -91,7 +91,7 @@ verifyTextPresent - Logged in as testAdmin (Log out) + testAdmin @@ -99,12 +99,16 @@ Logout + + clickAndWait + link=Home + + clickAndWait link=Log out - diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminAccount.html b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminAccount.html index f11145b5..4a02cc64 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminAccount.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminAccount.html @@ -199,6 +199,11 @@ Log out + + clickAndWait + link=Home + + clickAndWait link=Log out @@ -209,7 +214,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminDelete.html b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminDelete.html index 3ed67b78..bc545b61 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminDelete.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminDelete.html @@ -169,6 +169,11 @@ Logout + + clickAndWait + link=Home + + clickAndWait link=Log out @@ -179,7 +184,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminFirstLogin.html index 2f495332..c44f4a2c 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminFirstLogin.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -96,7 +96,7 @@ verifyTextPresent - Email or Username + Email @@ -126,7 +126,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -161,7 +161,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -171,12 +171,7 @@ verifyTextPresent - Create Your New Password - - - - verifyTextPresent - Password + New Password @@ -211,7 +206,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -236,7 +231,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -311,7 +306,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -376,7 +371,7 @@ verifyTextPresent - Logged in as Sis Admin (Log out) + Sis Admin @@ -409,12 +404,16 @@ link=Log out + + clickAndWait + link=Home + + assertTitle VIVO -