diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index 047df8b4..09fcfcab 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -44,6 +44,11 @@ primates - VIVO Search Results + + verifyElementPresent + link=people + + verifyElementPresent link=activities @@ -169,16 +174,6 @@ Primate Diet Concept - - verifyElementPresent - link=Primate Health Talks - - - - verifyTextPresent - Primate Health Talks Seminar Series - - verifyElementPresent link=Primate College of America @@ -189,6 +184,16 @@ Primate College of America College + + verifyElementPresent + link=Primate Health Talks + + + + verifyTextPresent + Primate Health Talks Seminar Series + + verifyElementPresent link=Primate Research Laboratory @@ -229,16 +234,6 @@ Introduction to Primate Health Course - - verifyElementPresent - link=Primate University of America - - - - verifyTextPresent - Primate University of America University - - verifyElementPresent link=Primate Health and Fitness @@ -249,6 +244,16 @@ Primate Health and Fitness Invited Talk + + verifyElementPresent + link=Primate University of America + + + + verifyTextPresent + Primate University of America University + + verifyElementPresent link=Primate Colleges of the World @@ -269,16 +274,6 @@ Primate Health Check Event - - verifyElementPresent - link=Primate Heart Health - - - - verifyTextPresent - Primate Heart Health Service - - verifyElementPresent link=Primate Health Conference @@ -289,6 +284,16 @@ Primate Health Conference Conference + + verifyElementPresent + link=Primate Heart Health + + + + verifyTextPresent + Primate Heart Health Service + + verifyElementPresent link=Primate Habitat Research Grant @@ -299,16 +304,6 @@ Primate Habitat Research Grant Grant - - verifyElementPresent - link=Best Primate College - - - - verifyTextPresent - Best Primate College Award or Honor - - verifyElementPresent link=New Primate Students @@ -319,6 +314,16 @@ New Primate Students Workshop + + verifyElementPresent + link=Best Primate College + + + + verifyTextPresent + Best Primate College Award or Honor + + verifyElementPresent link=Primate History Library @@ -334,6 +339,11 @@ link=2 + + assertTitle + primates - VIVO Search Results + + verifyElementPresent link=Primate Memorial Building @@ -345,8 +355,13 @@ - assertTitle - primates - VIVO Search Results + verifyElementPresent + link=Primate Survival Planning Grant + + + + verifyTextPresent + Primate Survival Planning Grant Grant @@ -359,16 +374,6 @@ Primate Student of the Year Award or Honor - - verifyElementPresent - link=Primate Survival Planning Grant - - - - verifyTextPresent - Primate Survival Planning Grant Grant - - verifyElementPresent link=Primate College of New York @@ -419,6 +424,16 @@ Elderly Care Concept + + verifyElementPresent + link=Jane Memorial Building + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[9]/span + Building + verifyElementPresent link=exact:http://primatehealthintro.cornell.edu @@ -439,6 +454,16 @@ Human and Ape Brain Comparison Human Study + + verifyElementPresent + link=Person, Polly + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[12]/span + Person + verifyElementPresent link=Gorilla Moving Company @@ -459,6 +484,16 @@ PHC Proceedings Proceedings + + verifyElementPresent + link=State Fair Park + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[15]/span + Facility + verifyElementPresent link=USA222333444555 diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html index 3c46c6ec..18ebb6c3 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html @@ -121,11 +121,6 @@ - - selectWindow - null - - select name=SuperclassURI diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html index 031bd013..27df6d69 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html @@ -138,11 +138,6 @@ - - selectWindow - null - - clickAndWait css=img.edit-individual diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index 5927d09f..bab1bc16 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -3172,77 +3172,6 @@ Index of Contents - - - selectWindow - null - - - - clickAndWait - link=Conference - - - - assertTitle - Conference - - - - clickAndWait - link=Variety of Apes in Africa - - - - assertTitle - Variety of Apes in Africa - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - name=_delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index of Contents - - pause diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 19ba29c8..d49b1e7e 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -113,7 +113,7 @@ waitForPageToLoad - 5000 + 10000 @@ -178,7 +178,7 @@ waitForPageToLoad - 5000 + 1000 diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index 536f31c5..4b4d73a1 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -186,16 +186,6 @@ Primate Feeding Training Service - - verifyElementPresent - link=Primate Feeding - - - - verifyTextPresent - Primate Feeding Concept - - verifyElementPresent link=Primate Reactions @@ -206,6 +196,16 @@ Primate Reactions Case Study + + verifyElementPresent + link=Primate Feeding + + + + verifyTextPresent + Primate Feeding Concept + + verifyElementPresent link=African Primates @@ -216,16 +216,6 @@ African Primates Concept - - verifyElementPresent - link=Licensed Primate Expert - - - - verifyTextPresent - Licensed Primate Expert License - - verifyElementPresent link=Licensed Primate Instructor @@ -236,6 +226,16 @@ Licensed Primate Instructor License + + verifyElementPresent + link=Licensed Primate Expert + + + + verifyTextPresent + Licensed Primate Expert License + + verifyElementPresent link=Primate Expert Association @@ -292,6 +292,11 @@ chimp - VIVO Search Results + + verifyElementPresent + link=people + + verifyElementPresent link=research @@ -307,6 +312,16 @@ Chimp Lover for Life Award or Honor + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Faculty, Jane Assistant Professor + + type @@ -441,16 +456,6 @@ link=research - - verifyElementPresent - link=JF Feeding - - - - verifyTextPresent - JF Feeding Technique - - verifyElementPresent link=Primate Feeding @@ -461,6 +466,16 @@ Primate Feeding Training Service + + verifyElementPresent + link=JF Feeding + + + + verifyTextPresent + JF Feeding Technique + + verifyElementPresent xpath=(//a[contains(text(),'Primate Feeding')])[2] diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html b/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html index 73034dcf..602c9594 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html @@ -78,6 +78,16 @@ Faculty, Jane Assistant Professor + + verifyElementPresent + link=Librarian, Lily Lou + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Assistant Librarian + type diff --git a/utilities/acceptance-tests/suites/CreatePeople/TestUnicodeName.html b/utilities/acceptance-tests/suites/CreatePeople/TestUnicodeName.html index 256bb2f8..5fc1a306 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/TestUnicodeName.html +++ b/utilities/acceptance-tests/suites/CreatePeople/TestUnicodeName.html @@ -125,7 +125,7 @@ submit - + verifyTextPresent Marienkäfer, Mary