From eb7b31de3ce2be24c57eba987e07f8344dc69145 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 18 Jul 2011 20:54:52 +0000 Subject: [PATCH] Holly did some tweaking to CreatePeople test suite due to code fixed. --- .../suites/CreatePeople/AddFacultyInfo.html | 66 +- .../suites/CreatePeople/AddFacultyInfo2.html | 160 ++++ .../CreatePeople/DeleteFacultyInfo.html | 810 ++++++++++++++++++ .../suites/CreatePeople/EditFacultyInfo.html | 90 ++ .../CreatePeople/PublicFacultyInfo.html | 40 + .../CreatePeople/SearchFacultyInfo.html | 49 +- .../suites/CreatePeople/Suite.html | 70 +- 7 files changed, 1230 insertions(+), 55 deletions(-) diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index 61dbd494..35f21b0f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -854,16 +854,6 @@ Faculty, Jane - - clickAndWait - link=Cancel - - - - assertTitle - Faculty, Jane - - clickAndWait css=a.add-eRACommonsId > img.add-individual @@ -894,6 +884,11 @@ Edit + + verifyTextPresent + Add new entry for: eRA Commons id + + type tinymce @@ -909,9 +904,44 @@ Faculty, Jane + + clickAndWait + css=a.add-assigneeFor > img.add-individual + + + + assertTitle + Edit + + verifyTextPresent - Add new entry for: eRA Commons id + Select an existing Patent for Faculty, Jane + + + + clickAndWait + submit + + + + assertTitle + Edit + + + + type + name + USABC123456789 + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane @@ -925,13 +955,8 @@ - verifyTextPresent - Add an entry to: assigneeFor - - - - verifyTextPresent - There are no entries in the system to select from. + assertTitle + Faculty, Jane @@ -1114,6 +1139,11 @@ ABC123987 + + verifyElementPresent + link=USABC123456789 + + comment Log out diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html index 8101015f..73418317 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html @@ -539,11 +539,131 @@ Faculty, Jane + + comment + Add fields new to release 1.3 + + + + clickAndWait + css=a.add-eligibleFor > img.add-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-hasCredential > img.add-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-eRACommonsId > img.add-individual + + + + assertTitle + Edit + + + + type + tinymce + ABC123987 + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-assigneeFor > img.add-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + comment Verify all fields added + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + verifyElementPresent link=African Primates @@ -729,6 +849,46 @@ African Apes + + verifyElementPresent + link=Primate Expert Association + + + + verifyElementPresent + link=Primate Experts + + + + verifyElementPresent + link=Licensed Primate Expert + + + + verifyElementPresent + link=Licensed Primate Instructor + + + + verifyTextPresent + ABC123987 + + + + verifyTextPresent + ABC121212 + + + + verifyElementPresent + link=USA1234567890 + + + + verifyElementPresent + link=USABC123456789 + + comment Logout diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index e6789f7f..514ec11f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -1019,6 +1019,166 @@ Faculty, Jane + + clickAndWait + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + comment Verify everything is gone @@ -1264,6 +1424,656 @@ African Apes + + verifyElementNotPresent + link=Primate Expert Association + + + + verifyElementNotPresent + link=Primate Experts + + + + verifyElementNotPresent + link=Licensed Primate Expert + + + + verifyElementNotPresent + link=Licensed Primate Instructor + + + + verifyTextNotPresent + ABC123987 + + + + verifyTextNotPresent + ABC121212 + + + + verifyElementNotPresent + link=USA1234567890 + + + + verifyElementNotPresent + link=USABC123456789 + + + + comment + Delete Index stuff + + + + clickAndWait + link=Index + + + + verifyTextPresent + Faculty Member + + + + clickAndWait + link=Certificate + + + + assertTitle + Certificate + + + + clickAndWait + link=Primate Expert Association + + + + assertTitle + Primate Expert Association + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Patent + + + + assertTitle + Patent + + + + clickAndWait + link=USA1234567890 + + + + assertTitle + USA1234567890 + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Patent + + + + assertTitle + Patent + + + + clickAndWait + link=USABC123456789 + + + + assertTitle + USABC123456789 + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=African Primates + + + + assertTitle + African Primates + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primatia + + + + assertTitle + Primatia + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primatia Africana + + + + assertTitle + Primatia Africana + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + comment + Search for more stuff to be deleted + + + + type + querytext + primate + + + clickAndWait + css=input.search + + + + assertTitle + primate - VIVO Search Results + + + + clickAndWait + link=Primate Experts + + + + assertTitle + Primate Experts + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + assertTitle + VIVO Site Administration + + + + type + querytext + primate + + + clickAndWait + css=input.search + + + + assertTitle + primate - VIVO Search Results + + + + clickAndWait + link=Licensed Primate Expert + + + + assertTitle + Licensed Primate Expert + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + assertTitle + VIVO Site Administration + + + + type + querytext + primate + + + clickAndWait + css=input.search + + + + assertTitle + primate - VIVO Search Results + + + + clickAndWait + link=Licensed Primate Instructor + + + + assertTitle + Licensed Primate Instructor + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + assertTitle + VIVO Site Administration + + comment Logout diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index fe605554..bbcdc6a3 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -744,6 +744,11 @@ Faculty, Jane + + comment + Edit new release 1.3 fields + + clickAndWait css=a.edit-eligibleFor > img.edit-individual @@ -849,11 +854,76 @@ Faculty, Jane + + clickAndWait + css=a.edit-assigneeFor > img.edit-individual + + + + assertTitle + Edit + + + + clickAndWait + //input[@id='submit' and @value='Add a new item of this type'] + + + + assertTitle + Edit + + + + type + name + USA1234567890 + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + comment Verify all fields updated + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + verifyElementPresent link=Primatia Africana @@ -979,6 +1049,26 @@ African Apes + + verifyElementPresent + link=Primate Experts + + + + verifyTextPresent + Licensed Primate Instructor + + + + verifyTextPresent + ABC121212 + + + + verifyElementPresent + link=USA1234567890 + + comment Logout diff --git a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html index 293029a6..e4148abe 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html @@ -274,6 +274,46 @@ African Primates + + verifyElementPresent + link=Primate Expert Association + + + + verifyElementPresent + link=Primate Experts + + + + verifyElementPresent + link=Licensed Primate Expert + + + + verifyElementPresent + link=Licensed Primate Instructor + + + + verifyTextPresent + ABC123987 + + + + verifyTextPresent + ABC121212 + + + + verifyElementPresent + link=USA1234567890 + + + + verifyElementPresent + link=USABC123456789 + + comment Logout diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index f0cb612b..bd173bfc 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -129,11 +129,21 @@ link=research + + verifyElementPresent + link=activities + + verifyElementPresent link=Faculty, Jane + + verifyTextPresent + Faculty, Jane Assistant Professor + + verifyElementPresent link=African Primates @@ -141,12 +151,47 @@ verifyTextPresent - Faculty, Jane Assistant Professor + African Primates Subject Area + + + + verifyElementPresent + link=Primate Expert Association verifyTextPresent - African Primates Subject Area + Primate Expert Association Certificate + + + + verifyElementPresent + link=Primate Experts + + + + verifyTextPresent + Primate Expert + + + + verifyElementPresent + link=Licensed Primate Instructor + + + + verifyTextPresent + Licensed Primate Instructor + + + + verifyElementPresent + link=Licensed Primate Expert + + + + verifyTextPresent + Licensed Primate Expert diff --git a/utilities/acceptance-tests/suites/CreatePeople/Suite.html b/utilities/acceptance-tests/suites/CreatePeople/Suite.html index 43160d29..afde2435 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/Suite.html +++ b/utilities/acceptance-tests/suites/CreatePeople/Suite.html @@ -1,35 +1,35 @@ - - - - - - Test Suite - - - - - - - - - - - - - - - - - - - - - - - - - - -
Test Suite
FixWebpageField
CreateFacultyMember
CreateLibrarian
AddFacultyInfo
EditFacultyInfo
AddFacultyInfo2
PublicFacultyInfo
SearchFacultyInfo
DeleteFacultyInfo
UploadFacultyImage
ChangeFacultyImage
VerifyImageDisplay
UploadLibrarianImage
ChangeLibrarianImage
AssociateLibToFac
SearchPeople
BrowseIndex
DeleteFacultyImage
DeleteLibrarianImage
DeleteLibtoFacAssociation
DeleteTestPeople
UploadNonPersonImage
- - + + + + + + Test Suite + + + + + + + + + + + + + + + + + + + + + + + + + + +
Test Suite
FixWebpageField
CreateFacultyMember
CreateLibrarian
AddFacultyInfo
EditFacultyInfo
AddFacultyInfo2
PublicFacultyInfo
SearchFacultyInfo
DeleteFacultyInfo
UploadFacultyImage
ChangeFacultyImage
VerifyImageDisplay
UploadLibrarianImage
ChangeLibrarianImage
AssociateLibToFac
SearchPeople
BrowseIndex
DeleteFacultyImage
DeleteLibrarianImage
DeleteLibtoFacAssociation
DeleteTestPeople
UploadNonPersonImage
+ +