diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html index 28c8a7a3..a51090b8 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html @@ -109,6 +109,16 @@ Site Admin + + verifyElementPresent + link=My account + + + + verifyElementNotPresent + link=My profile + + comment Verify available options diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html index 0059ca4a..5bd5a6d4 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html @@ -379,6 +379,16 @@ VIVO Site Administration + + verifyElementPresent + link=My account + + + + verifyElementNotPresent + link=My profile + + comment log out diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html index 521d6393..34bab7f2 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html @@ -120,7 +120,7 @@ - verifyElementPresent + verifyElementNotPresent link=Institutional internal class @@ -249,41 +249,6 @@ Check links actually work - - clickAndWait - link=Institutional internal class - - - - assertTitle - VIVO Site Administration - - - - verifyTextNotPresent - We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help. - - - - clickAndWait - link=Site Admin - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Site Admin - - - - assertTitle - VIVO Site Administration - - clickAndWait link=Site information diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html index 089b1181..80395518 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html @@ -254,6 +254,16 @@ link=Log out + + verifyElementPresent + link=My account + + + + verifyElementNotPresent + link=My profile + + comment Log out diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html index 814053f0..b44b76d2 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html @@ -254,6 +254,16 @@ link=Log out + + verifyElementPresent + link=My account + + + + verifyElementNotPresent + link=My profile + + comment Log out diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html index 2eea4cae..342b623d 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html @@ -254,6 +254,16 @@ You have logged in, but the system contains no profile for you. + + verifyElementPresent + link=My account + + + + verifyElementNotPresent + link=My profile + + comment Log out diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html index cf6c9ce6..a6fc006d 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html @@ -254,6 +254,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html index 9808d7eb..7a3a96c1 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html @@ -159,6 +159,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html index 4e9bc6fe..80796b5b 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html @@ -89,24 +89,29 @@ loginForm - - clickAndWait - link=People - - - - assertTitle - People - - comment Navigate to Jane Faculty - click - link=Person (2) + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html index fc596cc1..abc18ce1 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html @@ -119,6 +119,11 @@ Verify 3 user accounts exist before trying to delete them + + verifyTextPresent + 9 accounts + + verifyElementPresent link=EddieEditor@cornell.edu @@ -149,16 +154,6 @@ name=deleteAccount - - click - //input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u4845'] - - - - click - //input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u4682'] - - clickAndWait name=delete-account @@ -171,7 +166,67 @@ verifyTextPresent - Deleted 3 accounts. + 8 accounts + + + + click + name=deleteAccount + + + + click + name=delete-account + + + + assertConfirmation + Are you sure you want to delete this account? + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO + + + + verifyTextPresent + 7 accounts + + + + click + name=deleteAccount + + + + click + name=delete-account + + + + assertConfirmation + Are you sure you want to delete this account? + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO + + + + verifyTextPresent + 6 accounts diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html index 55319283..195eae18 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html @@ -30,7 +30,7 @@ ValidateAdminProxy2 - deleteAllVisibleCookiesAndWait + deleteAllVisibleCookies diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html index 619c9154..b880c013 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html @@ -546,19 +546,19 @@ comment - Check My profile + Check My options - clickAndWait + verifyElementPresent + link=My account + + + + verifyElementNotPresent link=My profile - - assertTitle - Faculty, Jane - - comment Logout diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html index f7b07d06..b06c59af 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html @@ -30,7 +30,7 @@ ValidateAdminProxy2 - deleteAllVisibleCookiesAndWait + deleteAllVisibleCookies @@ -299,6 +299,16 @@ You have logged in, but the system contains no profile for you. + + verifyElementPresent + link=My account + + + + verifyElementNotPresent + link=My profile + + clickAndWait link=Index @@ -509,6 +519,16 @@ You have logged in, but the system contains no profile for you. + + verifyElementPresent + link=My account + + + + verifyElementNotPresent + link=My profile + + clickAndWait link=Index @@ -521,12 +541,12 @@ clickAndWait - link=Faculty + link=Faculty Member assertTitle - Faculty + Faculty Member @@ -709,6 +729,41 @@ link=Remove selection + + clickAndWait + link=My profile + + + + assertTitle + Faculty, Jane + + + + verifyTextPresent + Faculty, Jane + + + + clickAndWait + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + comment Logout diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html index 117f719c..3db4ddd9 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html @@ -30,7 +30,7 @@ ValidateAdminProxy2 - deleteAllVisibleCookiesAndWait + deleteAllVisibleCookies @@ -200,10 +200,45 @@ - clickAndWait + verifyElementNotPresent link=My profile + + verifyElementPresent + link=My account + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + assertTitle Faculty, Jane @@ -250,10 +285,40 @@ - clickAndWait + verifyElementNotPresent link=My profile + + verifyElementPresent + link=My account + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + assertTitle Faculty, Jane @@ -299,6 +364,16 @@ loginForm + + verifyElementNotPresent + link=My profile + + + + verifyElementPresent + link=My account + + clickAndWait link=Site Admin