diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html index 6919d7f7..8e693223 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Change password for admin account @@ -86,7 +91,7 @@ verifyTextPresent - testAdmin@cornell.edu + Test @@ -96,82 +101,107 @@ clickAndWait - link=Site Admin + link=My account assertTitle - VIVO Site Administration + VIVO verifyTextPresent - Site Administration + My account verifyTextPresent - User accounts + New password - clickAndWait - link=User accounts - - - - assertTitle - User Accounts - - - - clickAndWait - link=testAdmin - - - - assertTitle - User Account Control Panel + verifyTextPresent + Confirm new password comment - Add First and Last Name to testAdmin + Hit save without entering anything clickAndWait - //input[@value='Edit User Account'] + submitMyAccount assertTitle - User Account Editing Form + VIVO + + + + verifyTextPresent + Your changes have been saved. + + + + comment + Enter new password but not confirmation type - FirstName - Test + new-password + onlynew type - LastName - Admin - - - type - FirstName - test + confirm-password + clickAndWait - primaryAction + submitMyAccount assertTitle - User Account Control Panel + VIVO + + + + verifyTextPresent + Passwords do not match. + + + + comment + Enter confirmation but not new password + + + + type + new-password + + + + type + confirm-password + onlyconfirm + + + clickAndWait + submitMyAccount + + + + assertTitle + VIVO + + + + verifyTextPresent + Passwords do not match. @@ -179,34 +209,29 @@ Enter passwords that do not match - - clickAndWait - //input[@value='Reset Password'] - - - - assertTitle - User Account Editing Form - - type - Md5password + new-password Password2 type - passwordConfirmation + confirm-password incorrect2 - click - primaryAction + clickAndWait + submitMyAccount - assertAlert - The passwords do not match. + assertTitle + VIVO + + + + verifyTextPresent + Passwords do not match. @@ -216,22 +241,27 @@ type - Md5password + new-password junky type - passwordConfirmation + confirm-password junky - click - primaryAction + clickAndWait + submitMyAccount - assertAlert - Please enter a password between 6 and 12 characters long. + assertTitle + VIVO + + + + verifyTextPresent + Password must be between 6 and 12 characters. @@ -241,22 +271,27 @@ type - Md5password + new-password goody2 type - passwordConfirmation + confirm-password goody2 clickAndWait - primaryAction + submitMyAccount assertTitle - User Account Control Panel + VIVO + + + + verifyTextPresent + Your changes have been saved. @@ -304,69 +339,24 @@ loginPassword goody2 - - assertTitle - Log in to VIVO - - clickAndWait loginForm - - clickAndWait - link=Site Admin - - assertTitle - VIVO Site Administration - - - - verifyTextPresent - Site Administration - - - - verifyTextPresent - User accounts + VIVO clickAndWait - link=User accounts + link=My account assertTitle - User Accounts - - - - verifyTextPresent - testAdmin@cornell.edu - - - - clickAndWait - link=testAdmin - - - - assertTitle - User Account Control Panel - - - - clickAndWait - //input[@value='Reset Password'] - - - - assertTitle - User Account Editing Form + VIVO @@ -376,22 +366,27 @@ type - Md5password + new-password Password type - passwordConfirmation + confirm-password Password clickAndWait - primaryAction + submitMyAccount assertTitle - User Account Control Panel + VIVO + + + + verifyTextPresent + Your changes have been saved. @@ -414,11 +409,6 @@ VIVO - - verifyTextPresent - Log in - - diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html index b43c0b27..e2f2661b 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + comment Access secure bookmarked page without being logged in @@ -96,7 +101,7 @@ verifyTextPresent - testAdmin@cornell.edu + Test diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html index 86eca72e..f2e68c24 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + comment Must not be logged in @@ -111,7 +116,12 @@ assertTitle - User Accounts + VIVO + + + + verifyTextPresent + User accounts @@ -121,17 +131,7 @@ verifyTextNotPresent - Sis Admin - - - - clickAndWait - //input[@value='Add new user account'] - - - - assertTitle - User Account Editing Form + SisAdmin@cornell.edu @@ -139,44 +139,44 @@ Add new site admin account without the First Name - - select - RoleURI - label=system administrator - - - type - Username - Sis Admin - - - type - FirstName - Sis - - - type - LastName - Admin - - - type - Md5password - myPassword - - - type - passwordConfirmation - myPassword - clickAndWait - primaryAction + css=input.submit.add-account assertTitle - User Account Control Panel + VIVO + + + + type + email-address + SisAdmin@cornell.edu + + + type + first-name + Sis + + + type + last-name + Admin + + + click + //input[@name='role' and @value='http://permissionSet-50'] + + + + clickAndWait + submitAdd + + + + assertTitle + VIVO @@ -186,27 +186,37 @@ verifyTextPresent - Sis Admin + A new account for Sis Admin was successfully created. A notification email has been sent to SisAdmin@cornell.edu with instructions for activating the account and creating a password. + + + + verifyElementPresent + link=SisAdmin@cornell.edu verifyTextPresent - system administrator - - - - clickAndWait - //input[@value='See All User Accounts'] - - - - assertTitle - User Accounts + Sis verifyTextPresent - Sis Admin + Admin + + + + verifyTextPresent + INACTIVE + + + + verifyTextPresent + Site Admin + + + + verifyTextPresent + 0 diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html index 6b4f8a7f..0afb5327 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + comment Must not be logged in already diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html index 926cc5e7..5172ff70 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorLoginLogout.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorLoginLogout.html index ffa64948..0c81b2eb 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorLoginLogout.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorLoginLogout.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + comment Access secure bookmarked page without being logged in diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html index 5afe0a33..82cd9c9a 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Check Curator priviledges diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorLoginLogout.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorLoginLogout.html index 366e2093..a9999eaa 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorLoginLogout.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorLoginLogout.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + comment Access secure bookmarked page without being logged in diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html index 565b9f56..5c7e78cb 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Check Editor privileges diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html index 38f8c278..05fa8420 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Check Unprivileged User Rights diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html index a478a226..271a5069 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Create New Curator User @@ -106,82 +111,52 @@ assertTitle - User Accounts + VIVO + + + + verifyTextPresent + User accounts clickAndWait - //input[@value='Add new user account'] + css=input.submit.add-account assertTitle - User Account Editing Form + VIVO type - Username - Connie Curator + email-address + ConnieCurator@cornell.edu type - FirstName + first-name Connie type - LastName + last-name Curator - - select - RoleURI - label=curator - - - type - Md5password - myPassword - - - comment - Enter a mis-matched confirmation password - - - - type - passwordConfirmation - somethingElse - click - primaryAction + //input[@name='role' and @value='http://permissionSet-5'] - - assertAlert - The passwords do not match. - - - - comment - Now enter a correct password - - - - type - passwordConfirmation - myPassword - clickAndWait - primaryAction + submitAdd assertTitle - User Account Control Panel + VIVO @@ -190,29 +165,39 @@ - verifyText - //tr[1]/td[2] - Connie Curator + verifyElementPresent + link=ConnieCurator@cornell.edu + verifyText - //tr[2]/td[2] + //tr[1]/td[1] + ConnieCurator@cornell.edu + + + verifyText + //tr[1]/td[2] Connie verifyText - //tr[3]/td[2] + //tr[1]/td[3] Curator verifyText - //tr[4]/td[2] - 0 + //tr[1]/td[4] + INACTIVE verifyText - //tr[5]/td[2] - curator + //tr[1]/td[5] + Curator + + + verifyText + //tr[1]/td[6] + 0 comment diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html index 54f7399f..1b6ff297 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Create New Editor User @@ -106,82 +111,52 @@ assertTitle - User Accounts + VIVO + + + + verifyTextPresent + User accounts clickAndWait - //input[@value='Add new user account'] + css=input.submit.add-account assertTitle - User Account Editing Form + VIVO type - Username - Eddie Editor + email-address + EddieEditor@cornell.edu type - FirstName + first-name Eddie type - LastName + last-name Editor - - select - RoleURI - label=editor - - - type - Md5password - myPassword - - - comment - Enter a mis-matched confirmation password - - - - type - passwordConfirmation - somethingElse - click - primaryAction + //input[@name='role' and @value='http://permissionSet-4'] - - assertAlert - The passwords do not match. - - - - comment - Now enter a correct password - - - - type - passwordConfirmation - myPassword - clickAndWait - primaryAction + submitAdd assertTitle - User Account Control Panel + VIVO @@ -189,10 +164,20 @@ Confirm values for new user + + verifyTextPresent + A new account for Eddie Editor was successfully created. A notification email has been sent to EddieEditor@cornell.edu with instructions for activating the account and creating a password. + + + + verifyElementPresent + link=EddieEditor@cornell.edu + + verifyText - //tr[1]/td[2] - Eddie Editor + //tr[2]/td[1] + EddieEditor@cornell.edu verifyText @@ -201,18 +186,23 @@ verifyText - //tr[3]/td[2] + //tr[2]/td[3] Editor verifyText - //tr[4]/td[2] - 0 + //tr[2]/td[4] + INACTIVE verifyText - //tr[5]/td[2] - editor + //tr[2]/td[5] + Editor + + + verifyText + //tr[2]/td[6] + 0 comment diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html index 0c023715..7d81815d 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Create a new unprivileged user @@ -101,112 +106,102 @@ assertTitle - User Accounts + VIVO - - clickAndWait - //input[@value='Add new user account'] - - - - assertTitle - User Account Editing Form - - - - type - Username - Rick Rookie - - - type - FirstName - Rick - - - type - LastName - Rookie - - - select - RoleURI - label=self editor - - - type - Md5password - myPassword - - - comment - Enter a mis-matched confirmation password - - - - type - passwordConfirmation - somethingElse - - - click - primaryAction - - - - assertAlert - The passwords do not match. - - - - comment - Now enter a correct password - - - - type - passwordConfirmation - myPassword - - - clickAndWait - primaryAction - - - - assertTitle - User Account Control Panel - - - - comment - Confirm values for new user - - - - verifyText - //tr[1]/td[2] - Rick Rookie - - - verifyText - //tr[2]/td[2] - Rick - - - verifyText - //tr[3]/td[2] - Rookie - - - verifyText - //tr[4]/td[2] - 0 - verifyTextPresent - self editor + User accounts + + + + clickAndWait + //input[@value='Add new account'] + + + + assertTitle + VIVO + + + + verifyTextPresent + User accounts > Add new account + + + + type + email-address + rickRookie@cornell.edu + + + type + first-name + Rick + + + type + last-name + Rookie + + + click + //input[@name='role' and @value='http://permissionSet-1'] + + + + clickAndWait + submitAdd + + + + assertTitle + VIVO + + + + comment + Verify account + + + + verifyTextPresent + A new account for Rick Rookie was successfully created. A notification email has been sent to rickRookie@cornell.edu with instructions for activating the account and creating a password. + + + + verifyElementPresent + link=Rick Rookie + + + + verifyElementPresent + link=rickRookie@cornell.edu + + + + verifyTextPresent + Rick + + + + verifyTextPresent + Rookie + + + + verifyTextPresent + INACTIVE + + + + verifyTextPresent + Self Editor + + + + verifyTextPresent + 0 diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html index 468c1d2d..986a9028 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Delete new Curator account diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html index 26d04b1e..065f0c4e 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Delete new Editor account diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html index fe8623f8..0f4179c9 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Delete new Editor account diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html index bdd37770..95ae6751 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Check first time login process diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html index 19449279..71219ec9 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Check first time login process diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html index ea8b24e3..b527a766 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Check first time login process diff --git a/utilities/acceptance-tests/suites/CreateAccounts/Suite.html b/utilities/acceptance-tests/suites/CreateAccounts/Suite.html index 97b824eb..ad7360ec 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/Suite.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/Suite.html @@ -1,28 +1,28 @@ - - - - - - Test Suite - - - - - - - - - - - - - - - - - - - -
Test Suite
CreateNewSelfEditorUser
FirstTimeSelfEditorLogin
TryNewSelfEditorPassword
CheckSelfEditorPrivileges
CreateNewCuratorUser
FirstTimeCuratorLogin
CheckCuratorPrivileges
CheckCuratorLoginLogout
CreateNewEditorUser
FirstTimeEditorLogin
CheckEditorPrivileges
CheckEditorLoginLogout
DeleteNewSelfEditorUser
DeleteNewCuratorUser
DeleteNewEditorUser
- - + + + + + + Test Suite + + + + + + + + + + + + + + + + + + + +
Test Suite
CreateNewSelfEditorUser
FirstTimeSelfEditorLogin
TryNewSelfEditorPassword
CheckSelfEditorPrivileges
CreateNewCuratorUser
FirstTimeCuratorLogin
CheckCuratorPrivileges
CheckCuratorLoginLogout
CreateNewEditorUser
FirstTimeEditorLogin
CheckEditorPrivileges
CheckEditorLoginLogout
DeleteNewSelfEditorUser
DeleteNewCuratorUser
DeleteNewEditorUser
+ + diff --git a/utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html b/utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html index 2d2b1993..ac360253 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Try the reset password for user @@ -96,7 +101,7 @@ verifyTextPresent - You have logged in, but the system contains no profile for you. + You have logged in, but the system contains no profile for you. diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index 0418981f..37ad3b65 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Change site name, tagline, and copyright (then reset it to default)