diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html index eddb125d..536c3a96 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html @@ -516,7 +516,7 @@ verifyTextPresent - Animal Librarianship Member of panel 2003 - + Member of panel 2003 @@ -526,7 +526,7 @@ verifyTextPresent - Researching Primates Presenter 2009 - + Presenter 2009 @@ -551,7 +551,7 @@ verifyTextPresent - Service to the Profession Type + Service to the Profession in @@ -666,7 +666,7 @@ verifyTextPresent - Service to the Profession Type + Service to the Profession in @@ -771,7 +771,7 @@ verifyTextPresent - Primates of the World Board 2001 - 2003 + Board 2001 - 2003 @@ -781,7 +781,7 @@ verifyTextPresent - Carroll College Consultant 2010 - + Consultant 2010 - @@ -806,7 +806,7 @@ verifyTextPresent - Outreach & Community Service Type + Outreach & Community Service in @@ -921,7 +921,7 @@ verifyTextPresent - Outreach & Community Service Type + Outreach & Community Service in @@ -1026,7 +1026,7 @@ verifyTextPresent - Show Me the Primates! Booth 2001 + Booth 2001 @@ -1036,7 +1036,7 @@ verifyTextPresent - Librarians for the Better Treatment of Primates Chair 2009 - + Chair 2009 - diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html index 48399ceb..7676c32c 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html @@ -141,7 +141,7 @@ verifyTextPresent - Head Of Type + Head of @@ -256,7 +256,7 @@ verifyTextPresent - Membership Type + Membership in diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html index 49ac6fb1..df0176a3 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html @@ -114,11 +114,6 @@ Agreement (5) - - verifyTextPresent - Grant (5) - - verifyTextPresent Project (2) @@ -179,21 +174,31 @@ Department (1) - - verifyTextPresent - Department (1) - - verifyTextPresent Group (1) + + verifyTextPresent + Museum (1) + + verifyTextPresent Organization (4) + + verifyTextPresent + research + + + + verifyTextPresent + Grant (5) + + comment Verify links correct diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html index efe67eb1..e40d711e 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html @@ -241,7 +241,7 @@ verifyTextPresent - Animal Librarianship Member of panel 2003 - + Animal Librarianship, Member of panel 2003 @@ -251,7 +251,7 @@ verifyTextPresent - Researching Primates Presenter 2009 - + Researching Primates, Presenter 2009 diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html index 0ef88d75..99a4edfd 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html @@ -151,12 +151,12 @@ type - startField.year + startField-year 1999 type - endField.year + endField-year 2009 @@ -271,7 +271,7 @@ assertConfirmation - Are you sure you want to delete the property
Member at Large related role? + Are you sure you want to delete the property Member at Large related role? diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html index 0931320d..33485be7 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html @@ -206,7 +206,7 @@ comment - Delete everything + Delete activities @@ -241,7 +241,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -274,6 +274,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Agreement @@ -306,7 +311,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -339,6 +344,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Agreement @@ -371,7 +381,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -404,6 +414,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Agreement @@ -436,7 +451,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -459,11 +474,21 @@ 5000 + + assertTitle + VIVO Site Administration + + clickAndWait link=Index + + assertTitle + Index of Contents + + clickAndWait link=Agreement @@ -496,7 +521,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -529,6 +554,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Project @@ -561,7 +591,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -594,6 +624,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Project @@ -626,7 +661,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -659,69 +694,9 @@ link=Index - - clickAndWait - link=Course - - assertTitle - Course - - - - clickAndWait - link=Introduction to the Ape World - - - - assertTitle - Introduction to the Ape World - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - 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 + Index of Contents @@ -756,7 +731,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -789,6 +764,91 @@ link=Index + + assertTitle + Index of Contents + + + + comment + Delete courses + + + + clickAndWait + link=Course + + + + assertTitle + Course + + + + clickAndWait + link=Introduction to the Ape World + + + + assertTitle + Introduction to the Ape World + + + + 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 + + + + comment + Delete events + + clickAndWait link=Conference @@ -821,7 +881,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -854,6 +914,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Invited Talk @@ -886,7 +951,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -919,6 +984,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Presentation @@ -951,7 +1021,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -984,6 +1054,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Workshop @@ -1016,7 +1091,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -1049,14 +1124,24 @@ link=Index + + assertTitle + Index of Contents + + + + comment + Deleye organizations + + clickAndWait - link=Organization + link=Association assertTitle - Organization + Association @@ -1081,7 +1166,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -1114,14 +1199,89 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait - link=Organization + link=Association assertTitle - Organization + Association + + + + clickAndWait + link=LITA + + + + assertTitle + LITA + + + + 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=College + + + + assertTitle + College @@ -1146,7 +1306,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -1179,134 +1339,9 @@ link=Index - - clickAndWait - link=Organization - - assertTitle - Organization - - - - clickAndWait - link=Primates of the World - - - - assertTitle - Primates of the World - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - 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 - - - - clickAndWait - link=Organization - - - - assertTitle - Organization - - - - clickAndWait - link=Reference Division - - - - assertTitle - Reference Division - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - 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 + Index of Contents @@ -1341,7 +1376,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -1374,24 +1409,29 @@ link=Index - - clickAndWait - link=Organization - - assertTitle - Organization + Index of Contents clickAndWait - link=LITA + link=Department assertTitle - LITA + Department + + + + clickAndWait + link=Reference Division + + + + assertTitle + Reference Division @@ -1406,7 +1446,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -1439,24 +1479,29 @@ link=Index - - clickAndWait - link=Organization - - assertTitle - Organization + Index of Contents clickAndWait - link=LITA Too + link=Museum assertTitle - LITA Too + Museum + + + + clickAndWait + link=Primates of the World + + + + assertTitle + Primates of the World @@ -1471,7 +1516,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -1499,6 +1544,11 @@ VIVO Site Administration + + clickAndWait + link=Index + + comment Verify everything is gone @@ -1509,6 +1559,11 @@ link=Index + + assertTitle + Index of Contents + + refreshAndWait 10000 diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html index fa90a33f..61e9da6f 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html @@ -136,7 +136,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html index 203aaea6..9084631e 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html @@ -136,7 +136,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html index 3a87afa4..baf1ad84 100644 --- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html +++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html @@ -74,24 +74,34 @@ VIVO - VIVO Search Results + + verifyElementPresent + link=people + + verifyElementPresent link=activities - verifyTextPresent - VIVO + verifyElementPresent + link=research verifyTextPresent - NIH VIVO + Search results for 'VIVO' verifyTextPresent - NIH VIVO Too + NIH VIVO Grant + + + + verifyTextPresent + NIH VIVO Too Grant @@ -104,6 +114,11 @@ VIVO Cornell Grant Too + + verifyTextPresent + Faculty, Jane Assistant Professor + + verifyElementPresent link=VIVO @@ -129,6 +144,11 @@ link=VIVO Cornell Grant Too + + verifyElementPresent + link=Faculty, Jane + + comment Verify search results for APE @@ -149,9 +169,14 @@ ape - VIVO Search Results + + verifyTextPresent + Search results for 'ape' + + verifyElementPresent - link=courses + link=people @@ -159,6 +184,11 @@ link=activities + + verifyElementPresent + link=courses + + verifyElementPresent link=events @@ -171,32 +201,37 @@ verifyTextPresent - Habitats for Apes + Ape World Conference verifyTextPresent - Ape World + Introduction to the Ape World Course verifyTextPresent - History of Apes in Africa + Ape Health Program Service verifyTextPresent - Introduction to the Ape World + Prototype New Ape Home Project verifyTextPresent - Prototype New Ape Home + Faculty, Jane Assistant Professor verifyTextPresent - Ape Health Program + Habitats for Apes Grant + + + + verifyTextPresent + History of Apes in Africa Project @@ -229,6 +264,11 @@ link=Ape Health Program + + verifyElementPresent + link=Faculty, Jane + + comment Verify search results for PRIMATE @@ -244,6 +284,16 @@ //input[@value='Search'] + + verifyTextPresent + Search results for 'primate' + + + + verifyElementPresent + link=people + + verifyElementPresent link=events @@ -256,27 +306,37 @@ verifyTextPresent - Working with Primates + Working with Primates Workshop verifyTextPresent - Researching Primates + Researching Primates Presentation verifyTextPresent - Primates of the World + Show Me the Primates! Event verifyTextPresent - Show Me the Primates! + Primates of the World Museum verifyTextPresent - Librarians for the Better Treatment of Primates + Librarians for the Better Treatment of Primates Committee + + + + verifyTextPresent + Librarian, Lily Associate Librarian + + + + verifyTextPresent + Faculty, Jane Assistant Professor @@ -304,6 +364,16 @@ link=Librarians for the Better Treatment of Primates + + verifyElementPresent + link=Librarian, Lily + + + + verifyElementPresent + link=Faculty, Jane + + comment Verify search results for LIBRARIAN @@ -319,6 +389,186 @@ //input[@value='Search'] + + verifyTextPresent + Search results for 'librarian' + + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=events + + + + verifyElementPresent + link=organizations + + + + verifyTextPresent + Librarian, Lily Associate Librarian + + + + verifyTextPresent + Reference Division Department + + + + verifyTextPresent + Librarians for the Better Treatment of Primates Committee + + + + verifyTextPresent + Animal Librarianship Invited Talk + + + + verifyTextPresent + Amercian Library Association Association + + + + verifyElementPresent + link=Librarian, Lily + + + + verifyElementPresent + link=Reference Division + + + + verifyElementPresent + link=Librarians for the Better Treatment of Primates + + + + verifyElementPresent + link=Animal Librarianship + + + + verifyElementPresent + link=Amercian Library Association + + + + comment + Verify search results for ANIMAL + + + + type + querytext + animal + + + clickAndWait + //input[@value='Search'] + + + + verifyTextPresent + Search results for 'animal' + + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=activities + + + + verifyElementPresent + link=courses + + + + verifyElementPresent + link=events + + + + verifyTextPresent + Animal Librarianship Invited Talk + + + + verifyTextPresent + Librarian, Lily Associate Librarian + + + + verifyTextPresent + Introduction to the Ape World Course + + + + verifyTextPresent + History of Apes in Africa Project + + + + verifyTextPresent + Prototype New Ape Home Project + + + + verifyElementPresent + link=Animal Librarianship + + + + verifyElementPresent + link=Librarian, Lily + + + + verifyElementPresent + link=Introduction to the Ape World + + + + verifyElementPresent + link=History of Apes in Africa + + + + verifyElementPresent + link=Prototype New Ape Home + + + + comment + Verify search results for CARROLL + + + + type + querytext + carroll + + + clickAndWait + //input[@value='Search'] + + + + verifyTextPresent + Search results for 'carroll' + + verifyElementPresent link=people @@ -331,17 +581,92 @@ verifyTextPresent - Librarian, Lily | Associate Librarian + Carroll College College verifyTextPresent - Librarians for the Better Treatment of Primates + Librarian, Lily Associate Librarian + + + + verifyElementPresent + link=Carroll College + + + + verifyElementPresent + link=Librarian, Lily + + + + comment + Verify search results for LIBRARY + + + + type + querytext + library + + + clickAndWait + //input[@value='Search'] verifyTextPresent - Reference Division + Search results for 'library' + + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=events + + + + verifyElementPresent + link=organizations + + + + verifyTextPresent + Amercian Library Association Association + + + + verifyTextPresent + Animal Librarianship Invited Talk + + + + verifyTextPresent + Librarian, Lily Associate Librarian + + + + verifyTextPresent + Librarians for the Better Treatment of Primates Committee + + + + verifyTextPresent + Reference Division Department + + + + verifyElementPresent + link=Amercian Library Association + + + + verifyElementPresent + link=Animal Librarianship @@ -359,136 +684,6 @@ link=Reference Division - - comment - Verify search results for ANIMAL - - - - type - querytext - animal - - - clickAndWait - //input[@value='Search'] - - - - verifyElementPresent - link=events - - - - verifyTextPresent - Animal Librarianship - - - - verifyElementPresent - link=Animal Librarianship - - - - comment - Verify search results for CARROLL - - - - type - querytext - carroll - - - clickAndWait - //input[@value='Search'] - - - - verifyElementPresent - link=organizations - - - - verifyTextPresent - Carroll College - - - - verifyElementPresent - link=Carroll College - - - - comment - Verify search results for LIBRARY - - - - type - querytext - library - - - clickAndWait - //input[@value='Search'] - - - - verifyElementPresent - link=organizations - - - - verifyTextPresent - Amercian Library Association - - - - verifyTextPresent - MLIS Master of Library and Information Science - - - - verifyTextPresent - B.L.S. Bachelor of Library Science - - - - verifyTextPresent - D.L.S. Doctor of Library Science - - - - verifyTextPresent - M.L.S. Master of Library Science - - - - verifyElementPresent - link=Amercian Library Association - - - - verifyElementPresent - link=MLIS Master of Library and Information Science - - - - verifyElementPresent - link=B.L.S. Bachelor of Library Science - - - - verifyElementPresent - link=D.L.S. Doctor of Library Science - - - - verifyElementPresent - link=M.L.S. Master of Library Science - - comment Verify search results for FACULTY @@ -504,14 +699,24 @@ //input[@value='Search'] + + verifyTextPresent + Search results for 'faculty' + + verifyElementPresent link=people + + verifyElementPresent + link=organizations + + verifyTextPresent - Faculty, Jane | Assistant Professor + Faculty, Jane Assistant Professor