diff --git a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewCuratorUser.html b/utilities/acceptance-tests/suites/ProxyEditing/CreateNewCuratorUser.html index bf890b33..96a21cd4 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewCuratorUser.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/CreateNewCuratorUser.html @@ -176,7 +176,7 @@ verifyTextPresent - A new account for Connie Curator was successfully created. + A new account for Connie Curator was successfully created. diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html index 5cddfb76..d43a9a17 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html @@ -36,7 +36,7 @@ comment - Validate Admin Proxy Editing + Delete Admin Proxy Editing Relationships @@ -101,262 +101,17 @@ comment - Verify that correct fields and text are present + Verify relationships exist verifyTextPresent - Manage profile editing - - - - verifyTextPresent - Relate profile editors and profiles - - - - verifyTextPresent - Select editors - - - - verifyTextPresent - Select profiles - - - - verifyTextPresent - Profile editors - - - - comment - Enter nothing and get error message - - - - click - name=createRelationship - - - - verifyTextPresent - You must select a minimum of 1 editor and profile. - - - - assertTitle - VIVO - - - - comment - Select profile, but not editor - - - - type - //form[@id='add-relation']/fieldset[2]/section/input - Facult - - - type - //form[@id='add-relation']/fieldset[2]/section/input - fac - - - click - id=ui-active-menuitem - - - - click - name=createRelationship - - - - verifyTextPresent - You must select a minimum of 1 editor and profile. - - - - click - link=Remove selection - - - - comment - Select editor, but not profile - - - - type - id=selectProfileEditors - edito - - - click - id=ui-active-menuitem - - - - click - name=createRelationship - - - - verifyTextPresent - You must select a minimum of 1 editor and profile. - - - - click - link=Remove selection - - - - comment - Enter one of each - - - - type - id=selectProfileEditors - editor - - - click - id=ui-active-menuitem - - - - verifyTextPresent - Editor, Eddie | + Curator, Connie | verifyElementPresent - link=Remove selection - - - - type - //form[@id='add-relation']/fieldset[2]/section/input - faculty - - - click - id=ui-active-menuitem - - - - verifyTextPresent - Faculty, Jane | Faculty Member - - - - verifyElementPresent - link=Remove selection - - - - comment - Remove editor and attempt to save - - - - click - link=Remove selection - - - - click - name=createRelationship - - - - verifyTextPresent - You must select a minimum of 1 editor and profile. - - - - comment - Add back editor and then remove profile - - - - type - id=selectProfileEditors - editor - - - click - id=ui-active-menuitem - - - - click - css=p.proxy-info-profile > a.remove-proxy - - - - click - name=createRelationship - - - - verifyTextPresent - You must select a minimum of 1 editor and profile. - - - - comment - Add one link - - - - verifyTextPresent - Editor, Eddie | - - - - verifyElementPresent - link=Remove selection - - - - type - //form[@id='add-relation']/fieldset[2]/section/input - faculty - - - click - id=ui-active-menuitem - - - - verifyTextPresent - Faculty, Jane | Faculty Member - - - - verifyElementPresent - link=Remove selection - - - - clickAndWait - name=createRelationship - - - - assertTitle - VIVO - - - - comment - Verify relationship is set + link=Delete profile editor @@ -369,16 +124,6 @@ link=Delete profile editor - - verifyTextPresent - Add profile - - - - verifyTextPresent - Selected profiles: - - verifyTextPresent Faculty, Jane | Faculty Member @@ -389,34 +134,39 @@ link=Remove selection + + verifyTextPresent + Librarian, Lily | Librarian + + + + verifyElementPresent + link=Remove selection + + comment - Try to add relationship again + Delete all proxy editing relationships - - type - id=selectProfileEditors - editor - click - id=ui-active-menuitem + link=Remove selection - type - //form[@id='add-relation']/fieldset[2]/section/input - facul + click + link=Remove selection + click - id=ui-active-menuitem + link=Remove selection clickAndWait - name=createRelationship + link=Delete profile editor @@ -425,18 +175,43 @@ - type - id=addProfile - faculty + clickAndWait + link=Delete profile editor + - verifyTextPresent - no match + assertTitle + VIVO comment - Test that editing works + Verify everything is gone + + + + verifyTextNotPresent + Curator, Connie | + + + + verifyTextNotPresent + Editor, Eddie | + + + + verifyTextNotPresent + Faculty, Jane | Faculty Member + + + + verifyTextNotPresent + Librarian, Lily | Librarian + + + + comment + Test that editing no longer works for Eddie Editor @@ -457,7 +232,7 @@ type id=loginPassword - myPassword + Password clickAndWait @@ -470,23 +245,8 @@ - type - id=newPassword - Password - - - type - id=confirmPassword - Password - - - clickAndWait - name=passwordChangeForm - - - - assertTitle - VIVO + verifyElementNotPresent + link=My profile @@ -510,65 +270,80 @@ - clickAndWait - css=a.add-overview > img.add-individual - - - - assertTitle - Edit - - - - type - tinymce - I am able to edit. - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - verifyTextPresent - Faculty, Jane - - - - verifyTextPresent - I am able to edit. - - - - clickAndWait - link=My profile - - - - assertTitle - Faculty, Jane + verifyElementNotPresent + link=Edit this individual comment - Check My profile + Test that editing no longer works for Connie Curator clickAndWait + link=Log out + + + + clickAndWait + link=Log in + + + + assertTitle + Log in to VIVO + + + + type + id=loginName + ConnieCurator@cornell.edu + + + type + id=loginPassword + Password + + + clickAndWait + name=loginForm + + + + assertTitle + VIVO + + + + verifyElementNotPresent link=My profile + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + assertTitle Faculty, Jane + + verifyElementNotPresent + link=Edit this individual + + comment Logout diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html index 2738a166..4e9bc6fe 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html @@ -105,13 +105,8 @@ - type - querytext - faculty - - - clickAndWait - //input[@value='Search'] + click + link=Person (2) @@ -124,6 +119,11 @@ Faculty, Jane + + comment + Delete Jane Faculty + + clickAndWait link=Edit this individual @@ -134,14 +134,9 @@ Individual Control Panel - - comment - Delete Jane Faculty - - clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -175,13 +170,23 @@ - type - querytext - librarian + clickAndWait + link=Index + + + + assertTitle + Index of Contents + clickAndWait - //input[@value='Search'] + link=Person + + + + assertTitle + Person @@ -194,6 +199,11 @@ Librarian, Lily + + comment + Delete Lilly Librarian + + clickAndWait link=Edit this individual @@ -204,14 +214,9 @@ Individual Control Panel - - comment - Delete Lilly Librarian - - clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -239,126 +244,6 @@ VIVO Site Administration - - comment - Navigate to Paula Proxy - - - - type - querytext - administrative - - - clickAndWait - //input[@value='Search'] - - - - clickAndWait - link=Proxy, Paula - - - - assertTitle - Proxy, Paula - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - comment - Delete Lilly Librarian - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - clickAndWait - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - comment - Verify Jane Faculty, Lilly Librarian, and Paula Proxy are gone - - - - type - querytext - faculty - - - clickAndWait - //input[@value='Search'] - - - - verifyTextNotPresent - Faculty, Jane - - - - type - querytext - librarian - - - clickAndWait - //input[@value='Search'] - - - - verifyTextNotPresent - Librarian, Lily - - - - type - querytext - administrative - - - clickAndWait - //input[@value='Search'] - - - - verifyTextNotPresent - Librarian, Lily - - comment Logout diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html index 26f563f3..a01c7995 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html @@ -41,7 +41,7 @@ comment - Delete new Curator account + Delete all test user account @@ -114,34 +114,49 @@ VIVO + + comment + Verify 3 user accounts exist before trying to delete them + + verifyElementPresent - link=ConnieCurator@cornell.edu + ConnieCurator@cornell.edu + + + + verifyElementPresent + EddieEditor@cornell.edu + + + + verifyElementPresent + JaneFaculty@cornell.edu comment - Delete the account + Delete the accounts click - deleteAccount + //input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u7032'] + + + + click + //input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u884'] + + + + click + name=deleteAccount clickAndWait - delete-account - - - - assertConfirmation - Are you sure you want to delete this account? - - - - waitForPageToLoad - 5000 + name=delete-account @@ -150,18 +165,23 @@ - verifyTextPresent - User accounts - - - - verifyTextPresent - Deleted 1 accounts. + comment + Verify 3 user accounts are gone verifyElementNotPresent - link=ConnieCurator@cornell.edu + ConnieCurator@cornell.edu + + + + verifyElementNotPresent + EddieEditor@cornell.edu + + + + verifyElementNotPresent + JaneFaculty@cornell.edu diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html index f5eff2e0..778bfb67 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html @@ -36,7 +36,7 @@ comment - Validate multiple proxy editors + Validate multiple proxy editors setup by user @@ -111,7 +111,7 @@ verifyTextPresent - Editor, Eddie | + Editor, Eddie | @@ -120,23 +120,38 @@ - verifyTextNotPresent - Librarian, Lily | Librarian + comment + Now delete the two proxy editors + + + + click + link=Remove selection + + + + click + link=Remove selection + + + + clickAndWait + id=submitMyAccount + + + + assertTitle + VIVO + + + + verifyTextPresent + Your changes have been saved. comment - Now make Lily Librarian able to edit Jane Faculty's profiel - - - - - - - - - comment - Test that editing works for Lily Librarian + Test that editing no longer works for Eddie Editor @@ -165,13 +180,108 @@ - clickAndWait + verifyElementNotPresent link=My profile + + clickAndWait + link=Faculty Member + + assertTitle - Librarian, Lily + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + + + verifyElementNotPresent + link=Edit this individual + + + + comment + Test that editing no longer works for Connie Curator + + + + clickAndWait + link=Log out + + + + clickAndWait + link=Log in + + + + assertTitle + Log in to VIVO + + + + type + id=loginName + ConnieCurator@cornell.edu + + + type + id=loginPassword + Password + + + clickAndWait + name=loginForm + + + + verifyElementNotPresent + link=My profile + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + + + verifyElementNotPresent + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/ProxyEditing/Suite.html b/utilities/acceptance-tests/suites/ProxyEditing/Suite.html index f4cf2660..2f9e9956 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/Suite.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/Suite.html @@ -1,25 +1,25 @@ - - - - - - Test Suite - - - - - - - - - - - - - - - - -
Test Suite
CreateNewCuratorUser
CreateNewEditorUser
CreateNewLibrarian
CreateNewFacultyMember
CreateNewSelfEditorUser
ValidateAdminProxy
ValidateAdminProxy2
ValidateUserProxy
DeleteAdminProxy
DeleteUserProxy
DeleteNewUsers
DeleteNewPeople
- - + + + + + + Test Suite + + + + + + + + + + + + + + + + +
Test Suite
CreateNewCuratorUser
CreateNewEditorUser
CreateNewLibrarian
CreateNewFacultyMember
CreateNewSelfEditorUser
ValidateAdminProxy
ValidateAdminProxy2
DeleteAdminProxy
ValidateUserProxy
DeleteUserProxy
DeleteNewUsers
DeleteNewPeople
+ + diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html index f5eff2e0..464db565 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html @@ -100,10 +100,60 @@ - verifyTextPresent + verifyTextNotPresent Curator, Connie | + + verifyTextNotPresent + Editor, Eddie | + + + + comment + Now make Eddie and Connie proxy editors + + + + type + id=addProfileEditor + edito + + + click + id=ui-active-menuitem + + + + type + id=addProfileEditor + cura + + + click + id=ui-active-menuitem + + + + clickAndWait + id=submitMyAccount + + + + assertTitle + VIVO + + + + verifyTextPresent + Your changes have been saved. + + + + verifyTextPresent + Curator, Connie | + + verifyElementPresent link=Remove selection @@ -119,24 +169,9 @@ link=Remove selection - - verifyTextNotPresent - Librarian, Lily | Librarian - - comment - Now make Lily Librarian able to edit Jane Faculty's profiel - - - - - - - - - comment - Test that editing works for Lily Librarian + Test that editing works for Eddie Editor @@ -171,7 +206,62 @@ assertTitle - Librarian, Lily + Faculty, Jane + + + + verifyElementPresent + link=Edit this individual + + + + comment + Test that editing works for Connie Curator + + + + clickAndWait + link=Log out + + + + clickAndWait + link=Log in + + + + assertTitle + Log in to VIVO + + + + type + id=loginName + ConnieCurator@cornell.edu + + + type + id=loginPassword + Password + + + clickAndWait + name=loginForm + + + + clickAndWait + link=My profile + + + + assertTitle + Faculty, Jane + + + + verifyElementPresent + link=Edit this individual