From 12a6a97951fcc30d56ca8c768845903003772c51 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 25 Jan 2011 18:10:31 +0000 Subject: [PATCH] Added some additional processing for login/logout of admin accounts. --- ...kmarkedPage.html => AdminLoginLogout.html} | 63 +++- .../suites/AdminSecurity/AdminLogouts.html | 124 -------- .../suites/AdminSecurity/Suite.html | 41 ++- .../AdminSecurityVB/AdminLoginLogout.html | 279 ++++++++++++++++++ .../suites/AdminSecurityVB/AdminLogouts.html | 124 -------- .../suites/AdminSecurityVB/Suite.html | 41 ++- 6 files changed, 378 insertions(+), 294 deletions(-) rename utilities/acceptance-tests/suites/AdminSecurity/{AdminBookmarkedPage.html => AdminLoginLogout.html} (81%) delete mode 100644 utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html create mode 100644 utilities/acceptance-tests/suites/AdminSecurityVB/AdminLoginLogout.html delete mode 100644 utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html similarity index 81% rename from utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html rename to utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html index 81aac2e9..48edc947 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html @@ -60,8 +60,13 @@ - verifyTextPresent - Please enter your email address. + verifyTextNotPresent + testAdmin + + + + verifyTextNotPresent + Site Admin @@ -89,6 +94,21 @@ VIVO Site Administration + + verifyTextPresent + Log out + + + + verifyTextPresent + testAdmin + + + + verifyTextPresent + Site Admin + + comment Go to Site Information and then logout @@ -116,7 +136,7 @@ verifyTextPresent - You have logged out. + You have logged out. @@ -176,7 +196,7 @@ verifyTextPresent - You have logged out. + You have logged out. @@ -219,6 +239,41 @@ Index to VIVO Contents + + clickAndWait + link=Log out + + + + assertTitle + Index to VIVO Contents + + + + verifyTextPresent + You have logged out. + + + + verifyTextPresent + Please log in to manage content. + + + + verifyElementPresent + link=log in + + + + clickAndWait + link=Home + + + + assertTitle + VIVO + + diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html deleted file mode 100644 index afbddb8c..00000000 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - -AdminLogouts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AdminLogouts
deleteAllVisibleCookies
commentLogout and Check Security--more meaningul when there used to be two ways to logout
open/vivo/
assertTitleVIVO
clickAndWaitlink=Log in
assertTitleLog in to VIVO
verifyTextPresentLog in
commentLogin then logout using login link
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
verifyTextPresenttestAdmin
commentLogout
clickAndWaitlink=Home
assertTitleVIVO
clickAndWaitlink=Log out
assertTitleVIVO
- - diff --git a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html index 1d77f57f..710344c8 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html @@ -1,21 +1,20 @@ - - - - - - Test Suite - - - - - - - - - - - - -
Test Suite
SetDefaultTheme
AdminBadLogin
AdminBookmarkedPage
AdminChangePassword
AdminLogouts
NewAdminAccount
NewAdminFirstLogin
NewAdminDelete
- - + + + + + + Test Suite + + + + + + + + + + + +
Test Suite
SetDefaultTheme
AdminBadLogin
AdminLoginLogout
AdminChangePassword
NewAdminAccount
NewAdminFirstLogin
NewAdminDelete
+ + diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLoginLogout.html b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLoginLogout.html new file mode 100644 index 00000000..48edc947 --- /dev/null +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLoginLogout.html @@ -0,0 +1,279 @@ + + + + + + +AdminBookmarkedPage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AdminBookmarkedPage
commentTest various login/logout processes
deleteAllVisibleCookies
commentAccess secure bookmarked page without being logged in
open/vivo/siteAdmin
assertTitleLog in to VIVO
verifyTextPresentLog in
verifyTextNotPresenttestAdmin
verifyTextNotPresentSite Admin
commentNow login and verify secure page is brought up
typeloginNametestAdmin
typepasswordPassword
clickAndWaitloginForm
assertTitleVIVO Site Administration
verifyTextPresentLog out
verifyTextPresenttestAdmin
verifyTextPresentSite Admin
commentGo to Site Information and then logout
clickAndWaitlink=Site information
assertTitleSite Information Editing Form
clickAndWaitlink=Log out
assertTitleVIVO
verifyTextPresentYou have logged out.
verifyTextPresentWelcome to VIVO
verifyTextPresentLog in
commentVerify back on front page when logging back in
typeloginNametestAdmin
typepasswordPassword
clickAndWaitloginForm
commentGo to a public page, logout, and log back in going to directly to public page
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Log out
assertTitleIndex to VIVO Contents
verifyTextPresentYou have logged out.
verifyTextPresentPlease log in to manage content.
verifyElementPresentlink=log in
clickAndWaitlink=log in
assertTitleLog in to VIVO
typeloginNametestAdmin
typepasswordPassword
clickAndWaitloginForm
assertTitleIndex to VIVO Contents
clickAndWaitlink=Log out
assertTitleIndex to VIVO Contents
verifyTextPresentYou have logged out.
verifyTextPresentPlease log in to manage content.
verifyElementPresentlink=log in
clickAndWaitlink=Home
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html b/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html deleted file mode 100644 index afbddb8c..00000000 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/AdminLogouts.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - -AdminLogouts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AdminLogouts
deleteAllVisibleCookies
commentLogout and Check Security--more meaningul when there used to be two ways to logout
open/vivo/
assertTitleVIVO
clickAndWaitlink=Log in
assertTitleLog in to VIVO
verifyTextPresentLog in
commentLogin then logout using login link
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
verifyTextPresenttestAdmin
commentLogout
clickAndWaitlink=Home
assertTitleVIVO
clickAndWaitlink=Log out
assertTitleVIVO
- - diff --git a/utilities/acceptance-tests/suites/AdminSecurityVB/Suite.html b/utilities/acceptance-tests/suites/AdminSecurityVB/Suite.html index 1d77f57f..710344c8 100644 --- a/utilities/acceptance-tests/suites/AdminSecurityVB/Suite.html +++ b/utilities/acceptance-tests/suites/AdminSecurityVB/Suite.html @@ -1,21 +1,20 @@ - - - - - - Test Suite - - - - - - - - - - - - -
Test Suite
SetDefaultTheme
AdminBadLogin
AdminBookmarkedPage
AdminChangePassword
AdminLogouts
NewAdminAccount
NewAdminFirstLogin
NewAdminDelete
- - + + + + + + Test Suite + + + + + + + + + + + +
Test Suite
SetDefaultTheme
AdminBadLogin
AdminLoginLogout
AdminChangePassword
NewAdminAccount
NewAdminFirstLogin
NewAdminDelete
+ +