diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html index 7c7674bb..ea182e15 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -99,6 +99,16 @@ link=Log out + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + verifyTextPresent Site Administration @@ -160,7 +170,7 @@ - verifyTextPresent + assertAlert The passwords do not match. @@ -185,7 +195,7 @@ - verifyTextPresent + assertAlert Please enter a password between 6 and 12 characters long. @@ -269,6 +279,16 @@ loginForm + + assertTitle + VIVO + + + + clickAndWait + link=Site Admin + + assertTitle VIVO Site Administration diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html index a37c504b..8e9122de 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html index 4a02cc64..93428066 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html @@ -81,7 +81,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -89,6 +89,16 @@ Select User accounts option from Site Admin page + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + clickAndWait link=User accounts diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html index bc545b61..dd63e6ed 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html @@ -81,7 +81,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -89,6 +89,16 @@ Select User accounts option from Site Admin page + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + clickAndWait link=User accounts diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html index c44f4a2c..259b8f4b 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html @@ -361,7 +361,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -374,6 +374,16 @@ Sis Admin + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + verifyTextPresent Data Input diff --git a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html index cf484042..1d77f57f 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html @@ -1,21 +1,21 @@ - - - - - - Test Suite - - - - - - - - - - - - -
Test Suite
SetDefaultTheme
AdminBadLogin
AdminBookmarkedPage
AdminChangePassword
AdminLogouts
NewAdminAccount
NewAdminFirstLogin
NewAdminDelete
- - + + + + + + Test Suite + + + + + + + + + + + + +
Test Suite
SetDefaultTheme
AdminBadLogin
AdminBookmarkedPage
AdminChangePassword
AdminLogouts
NewAdminAccount
NewAdminFirstLogin
NewAdminDelete
+ + diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminChangePassword.html b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminChangePassword.html index 7c7674bb..ea182e15 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminChangePassword.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminChangePassword.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -99,6 +99,16 @@ link=Log out + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + verifyTextPresent Site Administration @@ -160,7 +170,7 @@ - verifyTextPresent + assertAlert The passwords do not match. @@ -185,7 +195,7 @@ - verifyTextPresent + assertAlert Please enter a password between 6 and 12 characters long. @@ -269,6 +279,16 @@ loginForm + + assertTitle + VIVO + + + + clickAndWait + link=Site Admin + + assertTitle VIVO Site Administration diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html index a37c504b..8e9122de 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminAccount.html b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminAccount.html index 4a02cc64..93428066 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminAccount.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminAccount.html @@ -81,7 +81,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -89,6 +89,16 @@ Select User accounts option from Site Admin page + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + clickAndWait link=User accounts diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminDelete.html b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminDelete.html index bc545b61..dd63e6ed 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminDelete.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminDelete.html @@ -81,7 +81,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -89,6 +89,16 @@ Select User accounts option from Site Admin page + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + clickAndWait link=User accounts diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminFirstLogin.html index c44f4a2c..259b8f4b 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/NewAdminFirstLogin.html @@ -361,7 +361,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -374,6 +374,16 @@ Sis Admin + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + verifyTextPresent Data Input