diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html index eb961cce..8061690b 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html @@ -544,14 +544,29 @@ Edit + + click + id=showAddFormButton + + + + type + id=searchTerm + Animal Health + + + click + id=searchButton + + verifyTextPresent - Select an existing Subject Area for Introduction to Primate Health + No search results found. clickAndWait - submit + link=exact:Can't find the concept you want? Create your own. @@ -561,12 +576,22 @@ type - name + id=relatedIndLabel Animal Health clickAndWait - submit + id=submit + + + + assertTitle + Edit + + + + clickAndWait + link=Return to Profile Page diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html index 9b5a4ba7..cb76c66b 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html @@ -294,36 +294,6 @@ Test other entry - - clickAndWait - //h3[@id='hasSubjectArea']/a/img - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Subject Area for Primate Feeder - - - - select - objectVar - label=Primate Diet - - - clickAndWait - submit - - - - assertTitle - Primate Feeder - - clickAndWait //h3[@id='freetextKeyword']/a/img @@ -374,11 +344,6 @@ Primate Research Lab Room 123 - - verifyTextPresent - Primate Diet - - verifyTextPresent Animal Diet diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html index aeab8e4d..3b3b5cb6 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html @@ -386,8 +386,8 @@ select - objectVar - label=the Congo + id=objectVar + label=Congo clickAndWait @@ -516,7 +516,22 @@ clickAndWait - //h3[@id='hasSubjectArea']/a/img + css=a.delete-hasSubjectArea > img.delete-individual + + + + assertTitle + VIVO + + + + assertTitle + Primate Health Conference + + + + clickAndWait + css=a.add-hasSubjectArea > img.add-individual @@ -525,13 +540,53 @@ - verifyTextPresent - Select an existing Subject Area for Primate Health Conference + click + id=showAddFormButton + + + + type + id=searchTerm + Animal Health + + + click + id=searchButton clickAndWait - submit + link=exact:Can't find the concept you want? Create your own. + + + + assertTitle + Edit + + + + type + id=relatedIndLabel + Anim + + + click + id=ui-active-menuitem + + + + clickAndWait + id=submit + + + + assertTitle + Edit + + + + clickAndWait + link=Return to Profile Page @@ -601,7 +656,7 @@ verifyTextPresent - the Congo + Congo diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index 52dc95a5..d4da96f6 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -1201,7 +1201,7 @@ verifyTextPresent - Librarian, Lily, Dr. 1999 - + Polly Person, Dr. 1999 - diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html index 041ef036..60e8b5f1 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html @@ -234,116 +234,11 @@ Primate Health - - comment - Test affiliation entry - - - - clickAndWait - //h3[@id='researchAreaOf']/a/img - - - - assertTitle - Edit - - - - verifyTextPresent - Add an entry to: research area of - - - - clickAndWait - submit - - - - assertTitle - Primate Health - - - - comment - Test links entry - - - - clickAndWait - //h3[@id='sourceVocabularyReference']/a/img - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Vocabulary Source Reference for Primate Health - - - - clickAndWait - submit - - - - assertTitle - Edit - - - - type - name - Not sure - - - clickAndWait - submit - - - - assertTitle - Primate Health - - comment Test other entry - - clickAndWait - //h3[@id='subjectAreaFor']/a/img - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Thing for Primate Health - - - - select - objectVar - label=Introduction to Primate Health - - - clickAndWait - submit - - - - assertTitle - Primate Health - - clickAndWait //h3[@id='narrower']/a/img @@ -356,7 +251,7 @@ verifyTextPresent - Select an existing Subject Area for Primate Health + Select an existing Concept for Primate Health @@ -371,7 +266,7 @@ verifyTextPresent - Edit "narrower term" entry for Primate Health + Create "narrower term" entry for Primate Health @@ -401,17 +296,32 @@ verifyTextPresent - Select an existing Subject Area for Primate Health + Select an existing Concept for Primate Health - select - objectVar - label=Elderly Care + clickAndWait + //input[@id='submit' and @value='Add a new item of this type'] + + + + assertTitle + Edit + + + + verifyTextPresent + Create "related" entry for Primate Health + + + + type + id=name + Elderly Care clickAndWait - submit + id=submit @@ -429,21 +339,6 @@ Animal Health - - verifyTextPresent - Librarian, Lily - - - - verifyTextPresent - Not sure - - - - verifyTextPresent - Introduction to Primate Health - - verifyTextPresent Primate Diet diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index f842511f..3252272d 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -74,11 +74,6 @@ primates - VIVO Search Results - - verifyElementPresent - link=people - - verifyElementPresent link=activities @@ -121,12 +116,17 @@ verifyTextPresent - Primate Health Subject Area + Primate Info Database verifyTextPresent - Primate Diet Subject Area + Primate Diet Concept + + + + verifyTextPresent + Primate Health Concept @@ -134,16 +134,6 @@ Primate Feeder Equipment - - verifyTextPresent - Primate Info Database - - - - verifyTextPresent - Primate Colleges of the World Consortium - - verifyTextPresent Primate Student of the Year Award or Honor @@ -151,52 +141,7 @@ verifyTextPresent - Primate Elderly Care Grant - - - - verifyTextPresent - Primate Health Check Event - - - - verifyTextPresent - Primate Health Conference Conference - - - - verifyTextPresent - Primate College of America College - - - - verifyTextPresent - Introduction to Primate Health Course - - - - verifyTextPresent - Primate Research Laboratory Laboratory - - - - verifyTextPresent - Portable Primate Habitat Equipment - - - - verifyTextPresent - Primate Habitat Research Grant Grant - - - - verifyTextPresent - Primate Habitat Research Grant Grant - - - - verifyTextPresent - Primate Survival Planning Grant Grant + Primate Colleges of the World Consortium @@ -211,7 +156,27 @@ verifyTextPresent - Primate Heart Health Clinic Service + Primate College of America College + + + + verifyTextPresent + Introduction to Primate Health Course + + + + verifyTextPresent + Primate Health Check Event + + + + verifyTextPresent + Primate Health Conference Conference + + + + verifyTextPresent + Primate Research Laboratory Laboratory @@ -221,17 +186,22 @@ verifyTextPresent - Elderly Care Subject Area + Portable Primate Habitat Equipment verifyTextPresent - 1234 Northern African Nation Address + Primate Habitat Research Grant Grant verifyTextPresent - Animal Health Subject Area + Primate Survival Planning Grant Grant + + + + verifyTextPresent + Primate Heart Health Clinic Service @@ -241,7 +211,12 @@ verifyTextPresent - Jane Memorial Building Building + Elderly Care Concept + + + + verifyTextPresent + Animal Health Concept @@ -254,6 +229,16 @@ primates - VIVO Search Results + + verifyTextPresent + 1234 Northern African Nation Address + + + + verifyTextPresent + Jane Memorial Building Building + + verifyTextPresent http://primatehealthintro.cornell.edu Webpage @@ -266,7 +251,17 @@ verifyTextPresent - Librarian, Lily Assistant Librarian + northern Africa Transnational Region + + + + verifyTextPresent + Congo Country + + + + verifyTextPresent + Africa Continent @@ -280,18 +275,13 @@ - verifyTextPresent - the Congo Country + + verifyTextPresent - northern Africa Transnational Region - - - - verifyTextPresent - Africa Continent + Primate Elderly Care Grant diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index e19eba76..a32f1166 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -134,11 +134,36 @@ //h2[@id='hasResearchArea']/a/img + + verifyTextPresent + Manage Concepts + + + + verifyTextPresent + There are currently no concepts specified. + + + + verifyElementPresent + link=Return to Profile Page + + click id=showAddFormButton + + type + id=searchTerm + Primatia + + + verifyTextPresent + No search results found. + + assertTitle Edit @@ -156,7 +181,7 @@ verifyTextPresent - Add Your Own Concept + Create Your Own Concept @@ -186,7 +211,7 @@ clickAndWait - link=Return + link=Return to Profile Page @@ -201,7 +226,7 @@ assertTitle - Edit + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html index 174d2f41..201b4cb7 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html @@ -139,9 +139,29 @@ Edit + + click + id=showAddFormButton + + + + type + id=searchTerm + African Primates + + + click + id=searchButton + + + + verifyTextPresent + No search results found. + + clickAndWait - //input[@id='submit' and @value='Add a new item of this type'] + link=exact:Can't find the concept you want? Create your own. @@ -151,7 +171,7 @@ type - name + id=relatedIndLabel African Primates @@ -159,6 +179,11 @@ submit + + clickAndWait + link=Return to Profile Page + + assertTitle Faculty, Jane @@ -339,6 +364,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce @@ -364,6 +394,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce @@ -389,6 +424,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce @@ -449,6 +489,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce @@ -474,6 +519,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce @@ -499,6 +549,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce @@ -524,6 +579,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce @@ -594,6 +654,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html index 063e1158..9530a297 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html @@ -144,6 +144,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce @@ -186,12 +191,12 @@ verifyTextPresent - core:Librarian + vivo:Librarian clickAndWait - link=exact:core:Librarian + link=exact:vivo:Librarian @@ -217,12 +222,12 @@ select SuperclassURI - label=core:Faculty Member + label=vivo:Faculty Member select SubclassURI - label=core:Librarian + label=vivo:Librarian clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index 7bcf929f..ba86017a 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -131,7 +131,7 @@ clickAndWait - //ul[@id='individual-hasResearchArea']/li[1]/a[3]/img + css=a.edit-hasResearchArea > img.edit-individual @@ -140,28 +140,38 @@ - clickAndWait - submit + click + link=Remove - assertTitle - Faculty, Jane + assertConfirmation + Are you sure you want to remove this term? + + + + waitForPageToLoad + 5000 + + + + click + link=Remove + + + + assertConfirmation + Are you sure you want to remove this term? + + + + waitForPageToLoad + 5000 clickAndWait - //ul[@id='individual-hasResearchArea']/li/a[3]/img - - - - assertTitle - Edit - - - - clickAndWait - submit + link=Return to Profile Page diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html index d4554a08..4e073d0e 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html @@ -116,7 +116,7 @@ clickAndWait - link=exact:core:Librarian + link=exact:vivo:Librarian diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 9b96ce18..65b099a0 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -129,11 +129,6 @@ Edit all fields - - selectWindow - null - - clickAndWait css=a.add-hasResearchArea > img.add-individual @@ -154,6 +149,21 @@ id=showAddFormButton + + type + id=searchTerm + Primatia Africana + + + click + id=searchButton + + + + verifyTextPresent + No search results found. + + clickAndWait link=exact:Can't find the concept you want? Create your own. @@ -181,7 +191,7 @@ clickAndWait - link=Return + link=Return to Profile Page @@ -324,16 +334,6 @@ Edit - - clickAndWait - //input[@id='submit' and @value='Add a new item of this type'] - - - - assertTitle - Edit - - type name diff --git a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html index e4148abe..890587db 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html @@ -215,13 +215,13 @@ - verifyElementPresent - link=CIT, Cornell University, Ithaca, NY, 14853 + verifyTextPresent + CIT, Cornell University, Ithaca, NY, 14853 - verifyElementPresent - link=Jungle 1234, Africa, 1234-56789 + verifyTextPresent + Jungle 1234, Africa, 1234-56789 diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index 1c52051b..136a5374 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -151,7 +151,7 @@ verifyTextPresent - African Primates Subject Area + African Primates Concept