From dbae3d8417047390bf63715434a4d7ff9d5aad5b Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 17 Jan 2011 23:53:16 +0000 Subject: [PATCH] Holly updated all the vivo-basic test suites to include the wilma changes. --- .../AddNonPersonThingsVB/CheckIndexView.html | 105 +- .../AddNonPersonThingsVB/CheckPublicView.html | 1002 ++++++++--------- .../AddNonPersonThingsVB/CreateActivity.html | 95 +- .../AddNonPersonThingsVB/CreateCourse.html | 365 ++---- .../AddNonPersonThingsVB/CreateEquipment.html | 14 +- .../AddNonPersonThingsVB/CreateEvent.html | 273 +++-- .../AddNonPersonThingsVB/CreateLocation.html | 20 +- .../CreateOrganization.html | 406 +++---- .../AddNonPersonThingsVB/CreateTopic.html | 24 +- .../DeleteIndexStuff.html | 816 +++++++------- .../VerifyAllThingsSearchable.html | 105 +- .../suites/AddPublicationsVB/AddArticle.html | 448 +------- .../suites/AddPublicationsVB/AddBook.html | 222 +--- .../suites/AddPublicationsVB/AddChapter.html | 73 +- .../AddPublicationsVB/AddConference.html | 78 +- .../AddPublicationsVB/CheckIndexView.html | 28 +- .../AddPublicationsVB/CheckPublicView.html | 61 +- .../AddPublicationsVB/DeleteIndexStuff.html | 12 +- .../DeleteValidationStuff.html | 7 +- .../AddPublicationsVB/SearchPublications.html | 37 +- .../AddPublicationsVB/ValidateFields.html | 319 +++--- .../AddRolesVB/AddFacultyMemberRoles1.html | 57 +- .../AddRolesVB/AddFacultyMemberRoles2.html | 63 +- .../suites/AddRolesVB/AddLibrarianRoles1.html | 125 +- .../suites/AddRolesVB/AddLibrarianRoles2.html | 28 +- .../suites/AddRolesVB/CheckIndexView.html | 15 +- .../AddFacultyClassAutolink.html | 6 +- .../suites/CreatePeopleVB/AddFacultyInfo.html | 94 +- .../CreatePeopleVB/AddFacultyInfo2.html | 157 +-- .../CreatePeopleVB/AddFacultyPosition.html | 30 +- .../AddLibrarianClassAutolink.html | 8 +- .../suites/CreatePeopleVB/BrowseIndex.html | 2 +- .../CreatePeopleVB/ChangeFacultyImage.html | 6 +- .../CreatePeopleVB/ChangeLibrarianImage.html | 25 +- .../CreatePeopleVB/CheckPeopleLinks.html | 6 +- .../CreatePeopleVB/DeleteFacultyImage.html | 9 +- .../CreatePeopleVB/DeleteFacultyInfo.html | 472 +++----- .../CreatePeopleVB/DeleteLibrarianImage.html | 9 +- .../CreatePeopleVB/EditFacultyInfo.html | 192 +--- .../CreatePeopleVB/PublicFacultyInfo.html | 55 - .../CreatePeopleVB/SearchFacultyInfo.html | 90 +- .../CreatePeopleVB/UploadFacultyImage.html | 12 +- .../CreatePeopleVB/UploadLibrarianImage.html | 24 +- .../CreatePeopleVB/UploadNonPersonImage.html | 48 +- .../suites/CreatePeopleVB/lily1.jpg | Bin 4127 -> 42412 bytes .../suites/CreatePeopleVB/lily4.gif | Bin 16387 -> 26721 bytes .../AddMuseumArchDetails.html | 2 +- .../AddMuseumVisitingHours.html | 7 +- .../AddEducationBackground.html | 87 +- .../ChangeEducationBackground.html | 48 +- .../CheckPublicView.html | 13 +- .../DeleteEducationalBackground.html | 32 +- .../SearchEducationBackground.html | 29 +- .../CustomPositionsFormVB/AddPositions.html | 44 +- .../ChangePositions.html | 58 +- .../CheckPublicView.html | 8 +- .../DeletePositions.html | 16 +- .../SearchPositions.html | 117 +- 58 files changed, 2626 insertions(+), 3878 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckIndexView.html index 438de6c5..6feae912 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckIndexView.html @@ -79,11 +79,6 @@ people - - verifyTextPresent - courses - - verifyTextPresent activities @@ -91,7 +86,7 @@ verifyTextPresent - topics + courses @@ -109,6 +104,11 @@ equipment + + verifyTextPresent + research + + verifyTextPresent locations @@ -136,22 +136,7 @@ verifyTextPresent - Course (1) - - - - verifyTextPresent - Semester Class (1) - - - - verifyTextPresent - Agreement (2) - - - - verifyTextPresent - Grant (2) + Agreement (3) @@ -161,12 +146,12 @@ verifyTextPresent - Subject Area (4) + Course (1) verifyTextPresent - Academic Term (2) + Academic Term (1) @@ -214,6 +199,36 @@ Equipment (2) + + verifyTextPresent + Book (1) + + + + verifyTextPresent + Database (1) + + + + verifyTextPresent + Grant (3) + + + + verifyTextPresent + Proceedings (1) + + + + verifyTextPresent + Subject Area (4) + + + + verifyTextPresent + Webpage (1) + + verifyTextPresent Building (1) @@ -254,26 +269,11 @@ link=Person - - verifyElementPresent - link=Course - - - - verifyElementPresent - link=Semester Class - - verifyElementPresent link=Agreement - - verifyElementPresent - link=Grant - - verifyElementPresent link=Service @@ -281,7 +281,7 @@ verifyElementPresent - link=Subject Area + link=Course @@ -334,6 +334,31 @@ link=Equipment + + verifyElementPresent + link=Book + + + + verifyElementPresent + link=Grant + + + + verifyElementPresent + link=Proceedings + + + + verifyElementPresent + link=Subject Area + + + + verifyElementPresent + link=Webpage + + verifyElementPresent link=Building diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html index 1b652681..3b47e613 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html @@ -96,17 +96,57 @@ verifyTextPresent - Primate College of America Dr., 1999 - + Primate College of America, Dr. 1999 - verifyTextPresent - Primate Health | Subject Area + Introduction to Primate Health Course + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Librarian + + + + assertTitle + Librarian + + + + verifyElementPresent + link=Librarian, Lily verifyTextPresent - Introduction to Primate Health | Course + Librarian, Lily Assistant Librarian + + + + clickAndWait + link=Librarian, Lily + + + + assertTitle + Librarian, Lily + + + + verifyTextPresent + Primate Health Conference Conference @@ -124,6 +164,46 @@ Index to VIVO Contents + + comment + Verify Activities + + + + clickAndWait + link=Service + + + + assertTitle + Service + + + + clickAndWait + link=Primate Heart Health Clinic + + + + assertTitle + Primate Heart Health Clinic + + + + verifyTextPresent + Primate College of America Founder 2010 - + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + comment Verify Courses @@ -151,7 +231,7 @@ verifyTextPresent - Primate Health and Fitness | Invited Talk + Primate College of America College @@ -161,27 +241,12 @@ verifyTextPresent - Faculty, Jane | Assistant Professor + Faculty, Jane Assistant Professor verifyTextPresent - Introduction to Primate Health | Course - - - - verifyTextPresent - Fall 2010 | Academic Term - - - - verifyTextPresent - Africa | geographical_region - - - - verifyTextPresent - Liberia + Introduction to Primate Health Course @@ -191,382 +256,47 @@ verifyTextPresent - 2010-09-06 + Africa geographical_region verifyTextPresent - 2010 + Liberia verifyTextPresent - 2010-12-07 + http://primatehealthintro.cornell.edu Webpage verifyTextPresent - 2010 + Introduction to Primate Health Course verifyTextPresent - Fall 2010 | Academic Term + Animal Health Subject Area verifyTextPresent - Introduction to Primate Health | Course + Primate Health Subject Area verifyTextPresent - Primate Health Check | Event + Primate Health Check Event verifyTextPresent - Animal Health | Subject Area + 9 verifyTextPresent - Primate Health | Subject Area - - - - comment - Go back to Index - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - comment - Verify Activities - - - - clickAndWait - link=Grant - - - - assertTitle - Grant - - - - clickAndWait - link=Primate Elderly Care - - - - assertTitle - Primate Elderly Care - - - - verifyTextPresent - Primate Colleges of the World | Consortium - - - - verifyTextPresent - Primate Research Laboratory | Laboratory - - - - verifyTextPresent - Purpose of grant is to determine the appropriate environment, physical activity, and diet for primates as they age. - - - - verifyTextPresent - Primate Colleges of the World | Consortium - - - - verifyTextPresent - $1,234,567 - - - - verifyTextPresent - $999,999 - - - - verifyTextPresent - 1234-5678 - - - - verifyTextPresent - 2010-09-01 - - - - verifyTextPresent - 2012-08-31 - - - - verifyTextPresent - P999-1234 - - - - verifyTextPresent - Primate Student of the Year | Award or Honor - - - - verifyTextPresent - Elderly Care | Subject Area - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Grant - - - - assertTitle - Grant - - - - clickAndWait - link=Primate Habitat Research Grant - - - - assertTitle - Primate Habitat Research Grant - - - - verifyTextPresent - Primate College of America | College - - - - verifyTextPresent - Primate College of America | College - - - - comment - Go back to Index - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - comment - Verify Topics - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Animal Health - - - - assertTitle - Animal Health - - - - verifyTextPresent - Introduction to Primate Health | Course - - - - verifyTextPresent - Primate Health Conference | Conference - - - - verifyTextPresent - Primate Health | Subject Area - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Elderly Care - - - - assertTitle - Elderly Care - - - - verifyTextPresent - Primate Elderly Care | Grant - - - - verifyTextPresent - Primate Health | Subject Area - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Primate Diet - - - - assertTitle - Primate Diet - - - - verifyTextPresent - Primate Health | Subject Area - - - - verifyTextPresent - Primate Feeder | Equipment - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Primate Health - - - - assertTitle - Primate Health - - - - verifyTextPresent - Animal Health | Subject Area - - - - verifyTextPresent - Faculty, Jane | Assistant Professor - - - - verifyTextPresent - Not sure | Vocabulary Source Reference - - - - verifyTextPresent - Introduction to Primate Health | Course - - - - verifyTextPresent - Primate Diet | Subject Area - - - - verifyTextPresent - Elderly Care | Subject Area + Fall Semester 2007 | Academic Term @@ -601,57 +331,17 @@ clickAndWait - link=Fall 2010 + link=Fall Semester 2007 assertTitle - Fall 2010 + Fall Semester 2007 verifyTextPresent - Introduction to Primate Health | Semester Class - - - - verifyTextPresent - Introduction to Primate Health | Semester Class - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Academic Term - - - - assertTitle - Academic Term - - - - clickAndWait - link=Winter 2011 - - - - assertTitle - Winter 2011 - - - - verifyTextPresent - Primate Health Conference | Conference + Introduction to Primate Health Course @@ -684,11 +374,6 @@ Primate Health Conference - - verifyTextPresent - Primate Health and Fitness | Invited Talk - - verifyTextPresent First annual conference for those interested in the general health of primates. @@ -696,22 +381,12 @@ verifyTextPresent - self_governing + PHC Proceedings Proceedings verifyTextPresent - Kenya - - - - verifyTextPresent - Chad - - - - verifyTextPresent - the Congo + Librarian, Lily Assistant Librarian @@ -721,27 +396,32 @@ verifyTextPresent - 2011-01-05 + Kenya verifyTextPresent - 2011-01-09 + the Congo verifyTextPresent - Winter 2011 | Academic Term + 2011-01-05 to 2011-01-09 verifyTextPresent - Primate Health Check | Event + http://primatehealthintro.cornell.edu Webpage verifyTextPresent - Animal Health | Subject Area + Animal Health Subject Area + + + + verifyTextPresent + Primate Health Check Event @@ -784,16 +464,6 @@ Primate College of America Organizer 2008 - - verifyTextPresent - Introduction to Primate Health | Semester Class - - - - verifyTextPresent - Primate Health Conference | Conference - - clickAndWait link=Index @@ -829,16 +499,6 @@ Primate College of America Organizer 2008 - - verifyTextPresent - Introduction to Primate Health | Semester Class - - - - verifyTextPresent - Primate Health Conference | Conference - - comment Go back to Index @@ -886,82 +546,72 @@ verifyTextPresent - Privately Funded | Process + Primate College of America College verifyTextPresent - B.S. Bachelor of Science | Academic Degree + Primate College of America College verifyTextPresent - Primate College of America | College + B.S. Bachelor of Science Academic Degree verifyTextPresent - Primate College of America | College + Primate Habitat Research Grant Grant verifyTextPresent - Primate Habitat Research Grant | Grant + Primate Habitat Research Grant Grant verifyTextPresent - Primate Habitat Research Grant | Grant + Primate Survival Planning Grant Grant verifyTextPresent - Primate Student of the Year | Award or Honor + Primate Student of the Year Award or Honor verifyTextPresent - Primate Student of the Year | Award or Honor + Best Primate College Award or Honor Receipt verifyTextPresent - Portable Primate Habitat | Equipment + Portable Primate Habitat Equipment verifyTextPresent - Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Primate Research Laboratory | Laboratory + Primate History Library Library verifyTextPresent - Primate History Library | Library + Faculty, Jane, Dr. 1999 - verifyTextPresent - Position + Primates-r-us Founder 2010 - verifyTextPresent - Faculty, Jane Dr., 1999 - - - - - verifyTextPresent - Primates-r-us Funding source 2010 - - - - - verifyTextPresent - Primate Research Laboratory | Laboratory + Primates-r-us Organization @@ -971,7 +621,7 @@ verifyTextPresent - Primate History Library | Library + Primate History Library Library @@ -979,6 +629,11 @@ Primate Heart Health Clinic Founder 2010 - + + verifyTextPresent + Primate Info + + verifyTextPresent Primate Health and Fitness Organizer 2008 @@ -991,7 +646,7 @@ verifyTextPresent - northern Africa | geographical_region + northern Africa geographical_region @@ -1011,7 +666,12 @@ verifyTextPresent - 1234 Northern African Nation | Address + 1234 Northern African Nation Address + + + + verifyTextPresent + Introduction to Primate Health Course @@ -1056,7 +716,7 @@ verifyTextPresent - Primate Elderly Care | Grant + Primate Elderly Care Grant @@ -1066,7 +726,7 @@ verifyTextPresent - Primate Elderly Care | Grant + Primate Elderly Care Grant @@ -1101,12 +761,7 @@ verifyTextPresent - College - - - - verifyTextPresent - Primate College of America | College + Primate College of America College @@ -1141,22 +796,22 @@ verifyTextPresent - Primate Elderly Care | Grant + Primate Elderly Care Grant verifyTextPresent - Primate Feeder | Equipment + Primate Feeder Equipment verifyTextPresent - Jane Memorial Building | Building + Jane Memorial Building Building verifyTextPresent - Primate College of America | College + Primate College of America College @@ -1191,7 +846,7 @@ verifyTextPresent - Primate College of America Funding source 2010 - + Primate College of America Founder 2010 - @@ -1236,12 +891,12 @@ verifyTextPresent - Primate College of America | College + Primate College of America College verifyTextPresent - Jane Memorial Building | Building + Jane Memorial Building Building @@ -1276,17 +931,17 @@ verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Primate Research Lab Room 123 | Facility + Primate Research Lab Room 123 Facility verifyTextPresent - Primate Diet | Subject Area + Primate Diet Subject Area @@ -1309,6 +964,351 @@ Index to VIVO Contents + + comment + Verify Research + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Primate Elderly Care + + + + assertTitle + Primate Elderly Care + + + + verifyTextPresent + Primate Colleges of the World Consortium + + + + verifyTextPresent + Primate Research Laboratory Laboratory + + + + verifyTextPresent + Purpose of grant is to determine the appropriate environment, physical activity, and diet for primates as they age. + + + + verifyTextPresent + Primate Colleges of the World Consortium + + + + verifyTextPresent + $1,234,567 + + + + verifyTextPresent + $999,999 + + + + verifyTextPresent + 1234-5678 + + + + verifyTextPresent + Africa geographical_region + + + + verifyTextPresent + P999-1234 + + + + verifyTextPresent + Primate Student of the Year Award or Honor + + + + verifyTextPresent + Elderly Care Subject Area + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Primate Habitat Research Grant + + + + assertTitle + Primate Habitat Research Grant + + + + verifyTextPresent + Primate College of America College + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Primate Survival Planning Grant + + + + assertTitle + Primate Survival Planning Grant + + + + verifyTextPresent + Primate College of America College + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Elderly Care + + + + assertTitle + Elderly Care + + + + verifyTextPresent + Primate Elderly Care Grant + + + + verifyTextPresent + Primate Health Subject Area + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primate Diet + + + + assertTitle + Primate Diet + + + + verifyTextPresent + Primate Health Subject Area + + + + verifyTextPresent + Primate Feeder Equipment + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primate Health + + + + assertTitle + Primate Health + + + + verifyTextPresent + Animal Health Subject Area + + + + verifyTextPresent + Faculty, Jane Assistant Professor + + + + verifyTextPresent + Not sure Vocabulary Source Reference + + + + verifyTextPresent + Introduction to Primate Health Course + + + + verifyTextPresent + Primate Diet Subject Area + + + + verifyTextPresent + Elderly Care Subject Area + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Webpage + + + + assertTitle + Webpage + + + + clickAndWait + link=exact:http://primatehealthintro.cornell.edu + + + + assertTitle + exact:http://primatehealthintro.cornell.edu + + + + verifyTextPresent + Primate Health Conference Conference + + + + verifyTextPresent + Introduction to Primate Health Course + + + + comment + Go back to Index + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + comment Verify Locations @@ -1336,27 +1336,27 @@ verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Lab Admin Office | Room + Lab Admin Office Room verifyTextPresent - Primate Research Laboratory | Campus + Primate Research Laboratory Campus verifyTextPresent - Portable Primate Habitat | Equipment + Portable Primate Habitat Equipment verifyTextPresent - Primate Research Lab Room 123 | Facility + Primate Research Lab Room 123 Facility @@ -1391,7 +1391,7 @@ verifyTextPresent - Jane Memorial Building | Building + Jane Memorial Building Building diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html index 91bcca16..101c7675 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='administeredBy']/a + //div[@id='wrapper-content']/section[2]/article[1]/h3/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='grantAwardedBy']/a + //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img @@ -266,7 +266,7 @@ clickAndWait - //div[@id='abstract']/a + //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='grantSubcontractedThrough']/a + //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img @@ -321,7 +321,7 @@ clickAndWait - //div[@id='totalAwardAmount']/a + //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img @@ -351,7 +351,7 @@ clickAndWait - //div[@id='grantDirectCosts']/a + //div[@id='wrapper-content']/section[2]/article[7]/h3/a/img @@ -376,7 +376,7 @@ clickAndWait - //div[@id='sponsorAwardId']/a + //div[@id='wrapper-content']/section[2]/article[8]/h3/a/img @@ -401,12 +401,12 @@ comment - Test time entry + Test geographic focus clickAndWait - //div[@id='startDate']/a + //div[@id='wrapper-content']/section[3]/article/h3/a/img @@ -414,25 +414,10 @@ Edit - - verifyTextPresent - Add new entry for: start date - - - - type - yearstartDateEdited - 2010 - select - monthstartDateEdited - label=September - - - select - daystartDateEdited - label=1 + objectVar + label=Africa clickAndWait @@ -444,9 +429,14 @@ Primate Elderly Care + + comment + Test time entry + + clickAndWait - //div[@id='endDate']/a + //div[@id='wrapper-content']/section[4]/article/h3/a/img @@ -455,24 +445,24 @@ - verifyTextPresent - Add new entry for: end date + select + typeOfNew + label=Date/Time Interval (core) + + + clickAndWait + //input[@id='submit' and @value='add a new item to this list'] + + + + assertTitle + Edit type - yearendDateEdited - 2012 - - - select - monthendDateEdited - label=August - - - select - dayendDateEdited - label=31 + name + 2010-09-01 to 2012-08-31 clickAndWait @@ -491,7 +481,7 @@ clickAndWait - //div[@id='localAwardId']/a + //div[@id='wrapper-content']/section[5]/article/h3/a/img @@ -526,7 +516,7 @@ clickAndWait - //div[@id='fundingVehicleFor']/a + //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img @@ -556,7 +546,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img @@ -606,12 +596,12 @@ verifyTextPresent - Primate Colleges of the World | Consortium + Primate Colleges of the World Consortium verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory @@ -621,7 +611,7 @@ verifyTextPresent - Primate Colleges of the World | Consortium + Primate Colleges of the World Consortium @@ -641,12 +631,7 @@ verifyTextPresent - 2010-09-01 - - - - verifyTextPresent - 2012-08-31 + 2010-09-01 to 2012-08-31 @@ -656,12 +641,12 @@ verifyTextPresent - Primate Student of the Year | Award or Honor + Primate Student of the Year Award or Honor verifyTextPresent - Elderly Care | Subject Area + Elderly Care Subject Area diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html index 8db97e69..6f55b8cb 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='description']/a + //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='courseOfferedBy']/a + //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img @@ -261,7 +261,7 @@ clickAndWait - //div[@id='organizer']/a + //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img @@ -281,7 +281,7 @@ clickAndWait - //div[@id='prerequisiteFor']/a + //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img @@ -304,79 +304,9 @@ Introduction to Primate Health - - comment - Test research entry - - clickAndWait - //div[@id='geographicFocus']/a - - - - assertTitle - Edit - - - - select - objectVar - label=Africa - - - clickAndWait - submit - - - - assertTitle - Introduction to Primate Health - - - - comment - Test location entry - - - - clickAndWait - //div[@id='hasGeographicLocation']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Geographic Location for Introduction to Primate Health - - - - select - objectVar - label=Liberia - - - clickAndWait - submit - - - - assertTitle - Introduction to Primate Health - - - - comment - Test contact entry - - - - clickAndWait - //div[@id='contactInformation']/a + //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img @@ -404,6 +334,71 @@ Introduction to Primate Health + + comment + Test research entry + + + + clickAndWait + //div[@id='wrapper-content']/section[3]/article/h3/a/img + + + + assertTitle + Edit + + + + select + objectVar + label=Africa + + + clickAndWait + submit + + + + assertTitle + Introduction to Primate Health + + + + comment + Test location entry + + + + clickAndWait + //div[@id='wrapper-content']/section[4]/article/h3/a/img + + + + assertTitle + Edit + + + + verifyTextPresent + Select an existing Geographic Location for Introduction to Primate Health + + + + select + objectVar + label=Liberia + + + clickAndWait + submit + + + + assertTitle + Introduction to Primate Health + + comment Test time entry @@ -411,7 +406,7 @@ clickAndWait - //div[@id='startDate']/a + //div[@id='wrapper-content']/section[5]/article/h3/a/img @@ -421,107 +416,12 @@ verifyTextPresent - Add new entry for: start date - - - - type - yearstartDateEdited - 2010 - - - select - monthstartDateEdited - label=September - - - select - daystartDateEdited - label=6 - - - clickAndWait - submit - - - - assertTitle - Introduction to Primate Health + Select an existing Date/Time Interval for Introduction to Primate Health clickAndWait - //div[@id='startYear']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: start year - - - - type - tinymce - 2010 - - - clickAndWait - submit - - - - assertTitle - Introduction to Primate Health - - - - clickAndWait - //div[@id='endDate']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: end date - - - - type - yearendDateEdited - 2010 - - - select - monthendDateEdited - label=December - - - select - dayendDateEdited - label=7 - - - clickAndWait - submit - - - - assertTitle - Introduction to Primate Health - - - - clickAndWait - //div[@id='endYear']/a + //input[@id='submit' and @value='add a new item to this list'] @@ -531,33 +431,8 @@ type - tinymce - 2010 - - - clickAndWait - submit - - - - assertTitle - Introduction to Primate Health - - - - clickAndWait - //div[@id='hasTimeInterval']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Time Interval for Introduction to Primate Health - + name + Fall Semester 2007 clickAndWait @@ -576,7 +451,7 @@ clickAndWait - //div[@id='presents']/a + //div[@id='wrapper-content']/section[6]/article/h3/a/img @@ -594,19 +469,9 @@ Select an existing Document for Introduction to Primate Health - - verifyTextPresent - There are no entries in the system to select from. - - - - verifyTextPresent - Please create a new entry. - - clickAndWait - submit + //input[@id='submit' and @value='add a new item to this list'] @@ -641,7 +506,7 @@ clickAndWait - //div[@id='includesEvent']/a + //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img @@ -649,11 +514,6 @@ Edit - - verifyTextPresent - Select an existing Event for Introduction to Primate Health - - select objectVar @@ -671,7 +531,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -709,6 +569,31 @@ Introduction to Primate Health + + clickAndWait + //div[@id='wrapper-content']/section[7]/article[4]/h3/a/img + + + + assertTitle + Edit + + + + type + tinymce + 9 + + + clickAndWait + submit + + + + assertTitle + Introduction to Primate Health + + comment Verify everything entered is displaying properly @@ -716,7 +601,7 @@ verifyTextPresent - Primate College of America | College + Primate College of America College @@ -726,27 +611,12 @@ verifyTextPresent - Faculty, Jane | Assistant Professor + Faculty, Jane Assistant Professor verifyTextPresent - Introduction to Primate Health | Course - - - - verifyTextPresent - Fall 2010 | Academic Term - - - - verifyTextPresent - Africa | geographical_region - - - - verifyTextPresent - Liberia + Introduction to Primate Health Course @@ -756,47 +626,42 @@ verifyTextPresent - 2010-09-06 + Africa geographical_regio verifyTextPresent - 2010 + Liberia verifyTextPresent - 2010-12-07 + Fall Semester 2007 verifyTextPresent - 2010 + http://primatehealthintro.cornell.edu Webpage verifyTextPresent - Fall 2010 | Academic Term + Introduction to Primate Health Course verifyTextPresent - http://primatehealthintro.cornell.edu | Webpage + Primate Health Check Event verifyTextPresent - Introduction to Primate Health | Course + Animal Health Subject Area verifyTextPresent - Primate Health Check | Event - - - - verifyTextPresent - Animal Health | Subject Area + 9 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html index 9fa1eca7..0f76c3a7 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='equipmentFor']/a + //div[@id='wrapper-content']/section[2]/article/h3/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='equipmentInFacility']/a + //div[@id='wrapper-content']/section[3]/article/h3/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -326,7 +326,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img @@ -361,17 +361,17 @@ verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Primate Research Lab Room 123 | Facility + Primate Research Lab Room 123 Facility verifyTextPresent - Primate Diet | Subject Area + Primate Diet Subject Area diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html index 8a574584..77630766 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='description']/a + //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img @@ -236,7 +236,32 @@ clickAndWait - //div[@id='hasProceedings']/a + //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img + + + + clickAndWait + submit + + + + assertTitle + Edit + + + + type + name + PHC Proceedings + + + clickAndWait + submit + + + + assertTitle + Primate Health Conference @@ -269,6 +294,61 @@ Primate Health Conference + + clickAndWait + //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img + + + + assertTitle + Edit + + + + select + objectVar + label=Librarian, Lily + + + clickAndWait + submit + + + + assertTitle + Primate Health Conference + + + + clickAndWait + //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + + + + assertTitle + Edit + + + + verifyTextPresent + Add new entry for: contact information + + + + type + tinymce + info@primateconf.org + + + clickAndWait + submit + + + + assertTitle + Primate Health Conference + + comment Test research entry @@ -276,7 +356,7 @@ clickAndWait - //div[@id='geographicFocus']/a + //div[@id='wrapper-content']/section[3]/article/h3/a/img @@ -311,7 +391,7 @@ clickAndWait - //div[@id='hasGeographicLocation']/a + //div[@id='wrapper-content']/section[4]/article/h3/a/img @@ -327,42 +407,7 @@ select objectVar - label=Congo_the - - - clickAndWait - submit - - - - assertTitle - Primate Health Conference - - - - comment - Test contact entry - - - - clickAndWait - //div[@id='contactInformation']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: contact information - - - - type - tinymce - info@primateconf.org + label=the Congo clickAndWait @@ -381,7 +426,7 @@ clickAndWait - //div[@id='startDate']/a + //div[@id='wrapper-content']/section[5]/article/h3/a/img @@ -389,85 +434,10 @@ Edit - - verifyTextPresent - Add new entry for: start date - - - - type - yearstartDateEdited - 2011 - select - monthstartDateEdited - label=January - - - select - daystartDateEdited - label=5 - - - clickAndWait - submit - - - - assertTitle - Primate Health Conference - - - - clickAndWait - //div[@id='endDate']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: end date - - - - type - yearendDateEdited - 2011 - - - select - monthendDateEdited - label=January - - - select - dayendDateEdited - label=9 - - - clickAndWait - submit - - - - assertTitle - Primate Health Conference - - - - clickAndWait - //div[@id='hasTimeInterval']/a - - - - assertTitle - Edit - + typeOfNew + label=Date/Time Interval (core) clickAndWait @@ -480,14 +450,34 @@ - verifyTextPresent - Edit "time interval" entry for Primate Health Conference + type + name + 2011-01-05 to 2011-01-09 + + + clickAndWait + submit - type - name - Winter 2011 + assertTitle + Primate Health Conference + + + + comment + Test related documents entry + + + + clickAndWait + //div[@id='wrapper-content']/section[6]/article/h3/a/img + + + + assertTitle + Edit + clickAndWait @@ -506,7 +496,7 @@ clickAndWait - //div[@id='includesEvent']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -536,7 +526,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img @@ -561,7 +551,7 @@ clickAndWait - //div[@id='abbreviation']/a + //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img @@ -591,7 +581,7 @@ verifyTextPresent - Primate Health and Fitness | Invited Talk + Primate Health Conference @@ -601,22 +591,12 @@ verifyTextPresent - self_governing + PHC Proceedings Proceedings verifyTextPresent - Kenya - - - - verifyTextPresent - Chad - - - - verifyTextPresent - Congo_the + Librarian, Lily Assistant Librarian @@ -626,27 +606,32 @@ verifyTextPresent - 2011-01-05 + Kenya verifyTextPresent - 2011-01-09 + the Congo verifyTextPresent - Winter 2011 | Academic Term + 2011-01-05 to 2011-01-09 verifyTextPresent - Primate Health Check | Event + http://primatehealthintro.cornell.edu Webpage verifyTextPresent - Animal Health | Subject Area + Primate Health Check Event + + + + verifyTextPresent + Animal Health Subject Area diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html index 6e8b0c44..444eacff 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='facilityFor']/a + //div[@id='wrapper-content']/section[2]/article/h3/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='hasRoom']/a + //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img @@ -286,7 +286,7 @@ clickAndWait - //div[@id='geographicallyContains']/a + //div[@id='wrapper-content']/section[3]/article[2]/h3/a @@ -341,7 +341,7 @@ clickAndWait - //div[@id='locationOfEquipment']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -366,7 +366,7 @@ clickAndWait - //div[@id='geographicLocationOf']/a + //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img @@ -401,27 +401,27 @@ verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Lab Admin Office | Room + Lab Admin Office Room verifyTextPresent - Primate Research Laboratory | Campus + Primate Research Laboratory Campus verifyTextPresent - Portable Primate Habitat | Equipment + Portable Primate Habitat Equipment verifyTextPresent - Primate Research Lab Room 123 | Facility + Primate Research Lab Room 123 Facility diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html index 6f4445b0..c92f89d2 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html @@ -216,7 +216,7 @@ clickAndWait - //div[@id='overview']/a + //section[@id='individual-info']/h3/a/img @@ -224,11 +224,6 @@ Edit - - verifyTextPresent - Add new entry for: overview - - type tinymce @@ -246,7 +241,7 @@ clickAndWait - //div[@id='offersDegree']/a + //div[@id='wrapper-content']/section[3]/article[4]/h3/a/img @@ -254,11 +249,6 @@ Edit - - verifyTextPresent - Add an entry to: offers degree - - select objectVar @@ -276,7 +266,7 @@ clickAndWait - //div[@id='hasPredecessorOrganization']/a + //div[@id='wrapper-content']/section[3]/article[2]/h3/a/img @@ -284,16 +274,6 @@ Edit - - verifyTextPresent - Add an entry to: predecessor organization - - - - select - objectVar - label=Primate College of America - clickAndWait submit @@ -306,7 +286,7 @@ clickAndWait - //div[@id='awardsGrant']/a + //div[@id='wrapper-content']/section[3]/article[5]/h3/a/img @@ -314,11 +294,6 @@ Edit - - verifyTextPresent - Select an existing Grant for Primate College of America - - clickAndWait submit @@ -329,11 +304,6 @@ Edit - - verifyTextPresent - Edit "awards grant" entry for Primate College of America - - type name @@ -351,7 +321,7 @@ clickAndWait - //div[@id='subcontractsGrant']/a + //div[@id='wrapper-content']/section[3]/article[7]/h3/a/img @@ -359,36 +329,6 @@ Edit - - verifyTextPresent - Select an existing Grant for Primate College of America - - - - clickAndWait - submit - - - - assertTitle - Primate College of America - - - - clickAndWait - //div[@id='sponsors']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Award or Honor for Primate College of America - - clickAndWait submit @@ -399,11 +339,6 @@ Edit - - verifyTextPresent - Edit "sponsors award or honor" entry for Primate College of America - - type name @@ -421,7 +356,7 @@ clickAndWait - //div[@id='awardConferred']/a + //div[@id='wrapper-content']/section[3]/article[8]/h3/a/img @@ -429,14 +364,9 @@ Edit - - verifyTextPresent - Select an existing Award or Honor Receipt for Primate College of America - - clickAndWait - submit + //input[@id='submit' and @value='add a new item to this list'] @@ -461,7 +391,7 @@ clickAndWait - //div[@id='hasEquipment']/a + //div[@id='wrapper-content']/section[3]/article[9]/h3/a/img @@ -469,11 +399,6 @@ Edit - - verifyTextPresent - Select an existing Equipment for Primate College of America - - clickAndWait submit @@ -484,11 +409,6 @@ Edit - - verifyTextPresent - Edit "has equipment" entry for Primate College of America - - type name @@ -504,14 +424,9 @@ Primate College of America - - comment - Test affiliation entry - - clickAndWait - //div[@id='hasSubOrganization']/a + //div[@id='wrapper-content']/section[3]/article[6]/h3/a/img @@ -520,8 +435,43 @@ - verifyTextPresent - Select an existing Organization for Primate College of America + clickAndWait + //input[@id='submit' and @value='add a new item to this list'] + + + + assertTitle + Edit + + + + type + name + Primate Survival Planning Grant + + + clickAndWait + submit + + + + assertTitle + Primate College of America + + + + comment + Test affiliation entry + + + + clickAndWait + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + + + + assertTitle + Edit @@ -539,11 +489,6 @@ Edit - - verifyTextPresent - Edit "has sub-organization" entry for Primate College of America - - type name @@ -561,7 +506,7 @@ clickAndWait - //div[@id='subOrganizationWithin']/a + //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img @@ -569,11 +514,6 @@ Edit - - verifyTextPresent - Select an existing Organization for Primate College of America - - select typeOfNew @@ -590,9 +530,9 @@ - verifyTextPresent - Edit "organization within" entry for Primate College of America - + type + name + Primate type @@ -611,16 +551,11 @@ clickAndWait - //div[@id='organizationForPosition']/a + //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img assertTitle - Edit - - - - verifyTextPresent Create position history entry for Primate College of America @@ -631,7 +566,7 @@ type - startYear + startField.year 1999 @@ -646,12 +581,12 @@ clickAndWait - //div[@id='hasLeaderRole']/a + //div[@id='wrapper-content']/section[4]/article[4]/h3/a/img - verifyTextPresent - Create head of entry for Primate College of America + assertTitle + Edit @@ -671,7 +606,7 @@ type - startYear + startField.year 2010 @@ -686,7 +621,7 @@ clickAndWait - //div[@id='hasMemberRole']/a + //div[@id='wrapper-content']/section[4]/article[5]/h3/a/img @@ -695,8 +630,28 @@ - verifyTextPresent - Create membership entry for Primate College of America + select + objectVar + label=Primates-r-us + + + clickAndWait + submit + + + + assertTitle + Primate College of America + + + + clickAndWait + //div[@id='wrapper-content']/section[4]/article[6]/h3/a/img + + + + assertTitle + Edit @@ -716,7 +671,7 @@ type - startYear + startField.year 2009 @@ -731,7 +686,7 @@ clickAndWait - //div[@id='hasCollaborator']/a + //div[@id='wrapper-content']/section[4]/article[7]/h3/a/img @@ -739,11 +694,6 @@ Edit - - verifyTextPresent - Add an entry to: collaborator - - select objectVar @@ -761,7 +711,7 @@ clickAndWait - //div[@id='hasClinicalRole']/a + //div[@id='wrapper-content']/section[4]/article[8]/h3/a/img @@ -769,11 +719,6 @@ Edit - - verifyTextPresent - Create clinical activity entry for Primate College of America - - select typeSelector @@ -791,7 +736,7 @@ type - startYear + startField.year 2010 @@ -811,7 +756,7 @@ clickAndWait - //div[@id='hasPresenterRole']/a + //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img @@ -820,8 +765,33 @@ - verifyTextPresent - Create presentation entry for Primate College of America + select + typeSelector + label=Database + + + type + relatedIndLabel + Primate Info + + + clickAndWait + submit + + + + assertTitle + Primate College of America + + + + clickAndWait + //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img + + + + assertTitle + Edit @@ -841,7 +811,7 @@ type - startYear + startField.year 2008 @@ -861,7 +831,7 @@ clickAndWait - //div[@id='hasOutreachProviderRole']/a + //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img @@ -869,11 +839,6 @@ Edit - - verifyTextPresent - Create outreach & community service entry for Primate College of America - - select typeSelector @@ -891,12 +856,12 @@ type - startYear + startField.year 2008 type - endYear + endField.year 2010 @@ -916,7 +881,7 @@ clickAndWait - //div[@id='hasGeographicLocation']/a + //div[@id='wrapper-content']/section[7]/article/h3/a/img @@ -927,7 +892,7 @@ select objectVar - label=northern_Africa + label=northern Africa clickAndWait @@ -946,7 +911,7 @@ clickAndWait - //div[@id='email']/a + //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img @@ -971,7 +936,7 @@ clickAndWait - //div[@id='phoneNumber']/a + //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img @@ -979,11 +944,6 @@ Edit - - verifyTextPresent - Add new entry for: phone - - type tinymce @@ -1001,7 +961,7 @@ clickAndWait - //div[@id='faxNumber']/a + //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img @@ -1009,11 +969,6 @@ Edit - - verifyTextPresent - Add new entry for: fax - - type tinymce @@ -1031,7 +986,7 @@ clickAndWait - //div[@id='mailingAddress']/a + //div[@id='wrapper-content']/section[8]/article[4]/h3/a/img @@ -1040,8 +995,8 @@ - verifyTextPresent - Select an existing Address for Primate College of America + clickAndWait + //input[@id='submit' and @value='add a new item to this list'] @@ -1071,12 +1026,12 @@ comment - Test other entry + Test time entry clickAndWait - //div[@id='abbreviation']/a + //div[@id='wrapper-content']/section[9]/article/h3/a/img @@ -1085,8 +1040,48 @@ - verifyTextPresent - Add new entry for: abbreviation + select + typeOfNew + label=Date/Time Interval (core) + + + clickAndWait + //input[@id='submit' and @value='add a new item to this list'] + + + + assertTitle + Edit + + + + type + name + 1959 + + + clickAndWait + submit + + + + assertTitle + Primate College of America + + + + comment + Test other entry + + + + clickAndWait + //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img + + + + assertTitle + Edit @@ -1099,9 +1094,14 @@ submit + + assertTitle + Primate College of America + + clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img @@ -1109,11 +1109,6 @@ Edit - - verifyTextPresent - Add new entry for: keywords - - type tinymce @@ -1141,97 +1136,107 @@ verifyTextPresent - B.S. Bachelor of Science | Academic Degree + B.S. Bachelor of Science Academic Degree verifyTextPresent - Primate College of America | College + Primate College of America College verifyTextPresent - Primate College of America | College + Primate College of America College verifyTextPresent - Primate Habitat Research Grant | Grant + Primate Habitat Research Grant Grant verifyTextPresent - Primate Habitat Research Grant | Grant + Primate Survival Planning Grant Grant verifyTextPresent - Primate Student of the Year | Award or Honor + Primate Student of the Year Award or Honor verifyTextPresent - Best Primate College | Award or Honor + Best Primate College Award or Honor verifyTextPresent - Portable Primate Habitat | Equipment + Portable Primate Habitat Equipment verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Primate History Library | Library + Primate History Library Library verifyTextPresent - Position + Faculty, Jane, Dr. 1999 - verifyTextPresent - Faculty, Jane Dr. + Primates-r-us Founder 2010 - verifyTextPresent - Primate Research Laboratory | Laboratory + Primates-r-us Organization verifyTextPresent - Primate Colleges of the World Member + Primate Colleges of the World Member 2009 - verifyTextPresent - Primate History Library | Library + Primate History Library Library verifyTextPresent - Primate Heart Health Clinic Founder + Primate Heart Health Clinic Founder 2010 - verifyTextPresent - Primate Health and Fitness Organizer + database verifyTextPresent - Primate Health Check Sponsor + Primate Info verifyTextPresent - northern_Africa | geographical_region + Primate Health and Fitness Organizer 2008 - + + + + verifyTextPresent + Primate Health Check Sponsor 2008 - 2010 + + + + verifyTextPresent + northern Africa geographical_region @@ -1251,7 +1256,12 @@ verifyTextPresent - 1234 Northern African Nation | Address + 1234 Northern African Nation Address + + + + verifyTextPresent + 1959 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html index f301edda..d8e481e2 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='broader']/a + //div[@id='wrapper-content']/section[2]/article/h3/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='researchAreaOf']/a + //div[@id='wrapper-content']/section[3]/article/h3/a/img @@ -271,7 +271,7 @@ clickAndWait - //div[@id='sourceVocabularyReference']/a + //div[@id='wrapper-content']/section[4]/article/h3/a/img @@ -316,7 +316,7 @@ clickAndWait - //div[@id='subjectAreaFor']/a + //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img @@ -346,7 +346,7 @@ clickAndWait - //div[@id='narrower']/a + //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img @@ -391,7 +391,7 @@ clickAndWait - //div[@id='related']/a + //div[@id='wrapper-content']/section[5]/article[3]/h3/a/img @@ -426,32 +426,32 @@ verifyTextPresent - Animal Health | Subject Area + Animal Health Subject Area verifyTextPresent - Faculty, Jane | Assistant Professor + Faculty, Jane Assistant Professor verifyTextPresent - Not sure | Vocabulary Source Reference + Not sure Vocabulary Source Reference verifyTextPresent - Introduction to Primate Health | Course + Introduction to Primate Health Course verifyTextPresent - Primate Diet | Subject Area + Primate Diet Subject Area verifyTextPresent - Elderly Care | Subject Area + Elderly Care Subject Area diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html index 64b53aa0..ac0c6a39 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html @@ -124,11 +124,6 @@ people - - verifyTextPresent - courses - - verifyTextPresent activities @@ -136,7 +131,7 @@ verifyTextPresent - topics + courses @@ -156,7 +151,7 @@ verifyTextPresent - publications + research @@ -309,81 +304,6 @@ Index to VIVO Contents - - comment - Delete Courses - - - - clickAndWait - link=Course - - - - assertTitle - Course - - - - clickAndWait - link=Introduction to Primate Health - - - - assertTitle - Introduction to Primate Health - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - comment Delete Activities @@ -529,6 +449,76 @@ Index to VIVO Contents + + clickAndWait + link=Agreement + + + + assertTitle + Agreement + + + + clickAndWait + link=Primate Survival Planning Grant + + + + assertTitle + Primate Survival Planning Grant + + + + 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 entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + clickAndWait link=Service @@ -601,237 +591,27 @@ comment - Delete Topics + Delete Courses clickAndWait - link=Subject Area + link=Course assertTitle - Subject Area + Course clickAndWait - link=Animal Health + link=Introduction to Primate Health assertTitle - Animal Health - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Elderly Care - - - - assertTitle - Elderly Care - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Primate Diet - - - - assertTitle - Primate Diet - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Primate Health - - - - assertTitle - Primate Health + Introduction to Primate Health @@ -901,82 +681,12 @@ clickAndWait - link=Fall 2010 + link=Fall Semester 2007 assertTitle - Fall 2010 - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Academic Term - - - - assertTitle - Academic Term - - - - clickAndWait - link=Winter 2011 - - - - assertTitle - Winter 2011 + Fall Semester 2007 @@ -1666,27 +1376,367 @@ comment - Delete Publications + Delete research clickAndWait - link=Webpage + link=Book assertTitle - Webpage + Book clickAndWait - link=exact:http://primatehealthintro.cornell.edu + link=PHC Proceedings assertTitle - exact:http://primatehealthintro.cornell.edu + PHC Proceedings + + + + 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 entity? If in doubt, CANCEL. + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Database + + + + assertTitle + Database + + + + clickAndWait + link=Primate Info + + + + assertTitle + Primate Info + + + + 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 entity? If in doubt, CANCEL. + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Animal Health + + + + assertTitle + Animal Health + + + + 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 entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Elderly Care + + + + assertTitle + Elderly Care + + + + 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 entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primate Diet + + + + assertTitle + Primate Diet + + + + 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 entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primate Health + + + + assertTitle + Primate Health @@ -1751,12 +1801,12 @@ clickAndWait - link=Primate + link=exact:http://primatehealthintro.cornell.edu assertTitle - Primate + exact:http://primatehealthintro.cornell.edu @@ -2024,11 +2074,6 @@ people - - verifyTextNotPresent - courses - - verifyTextNotPresent activities @@ -2036,7 +2081,7 @@ verifyTextNotPresent - topics + courses @@ -2056,7 +2101,7 @@ verifyTextNotPresent - publications + research @@ -2064,6 +2109,11 @@ Building + + verifyTextNotPresent + Room + + verifyTextPresent locations diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html index 82f1ff2e..cf5a22cf 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html @@ -79,11 +79,6 @@ link=people - - verifyElementPresent - link=courses - - verifyElementPresent link=activities @@ -91,7 +86,7 @@ verifyElementPresent - link=topics + link=courses @@ -109,6 +104,11 @@ link=equipment + + verifyElementPresent + link=research + + verifyElementPresent link=locations @@ -129,11 +129,6 @@ Primates-r-us | Organization - - verifyTextPresent - Primate Habitat Research Grant | Grant - - verifyTextPresent Primate Colleges of the World | Consortium @@ -146,7 +141,7 @@ verifyTextPresent - Primate Health and Fitness | Invited Talk + Primate Info | Database @@ -171,12 +166,22 @@ verifyTextPresent - Primate Research Laboratory | Campus + Primate Health and Fitness | Invited Talk verifyTextPresent - Faculty, Jane | Assistant Professor + Introduction to Primate Health | Course + + + + verifyTextPresent + Primate Research Lab Room 123 | Facility + + + + verifyTextPresent + Primate College of America | College @@ -184,6 +189,21 @@ Primate Health | Subject Area + + verifyTextPresent + Primate Habitat Research Grant | Grant + + + + verifyTextPresent + Best Primate College | Award or Honor Receipt + + + + verifyTextPresent + Primate Survival Planning Grant | Grant + + verifyTextPresent Animal Health | Subject Area @@ -204,11 +224,6 @@ Primate Elderly Care | Grant - - verifyTextPresent - Primate College of America | College - - verifyTextPresent Jane Memorial Building | Building @@ -216,32 +231,17 @@ verifyTextPresent - Fall 2010 | Academic Term + http://primatehealthintro.cornell.edu | Webpage verifyTextPresent - Introduction to Primate Health | Semester Class - - - - verifyTextPresent - Elderly Care | Subject Area - - - - verifyTextPresent - Primate Health Conference | Conference - - - - verifyTextPresent - Privately Funded | Process + Faculty, Jane | Assistant Professor clickAndWait - link=2 + link=Next @@ -251,7 +251,17 @@ verifyTextPresent - Winter 2011 | Academic Term + Elderly Care | Subject Area + + + + verifyTextPresent + PHC Proceedings | Proceedings + + + + verifyTextPresent + Primate Health Conference | Conference @@ -271,7 +281,12 @@ verifyTextPresent - northern_Africa | geographical_region + Fall Semester 2007 | Academic Term + + + + verifyTextPresent + Librarian, Lily | Assistant Librarian @@ -279,6 +294,11 @@ Africa | geographical_region + + verifyTextPresent + northern Africa | geographical_region + + verifyTextPresent Liberia @@ -291,12 +311,7 @@ verifyTextPresent - Chad - - - - verifyTextPresent - Congo_the + the Congo diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html index d36da642..2b47c01a 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html @@ -156,7 +156,7 @@ clickAndWait - //div[@id='authorInAuthorship']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -201,17 +201,37 @@ assertTitle + Furter, Frank + + + + verifyElementPresent + link=Too Much Nintendo + + + + verifyTextPresent + academic article + + + + verifyTextPresent Too Much Nintendo comment - Verify author info is there + Go back to article - verifyElementPresent - link=Furter, Frank + clickAndWait + link=Too Much Nintendo + + + + assertTitle + Too Much Nintendo @@ -221,7 +241,7 @@ clickAndWait - //div[@id='volume']/a + //div[@id='wrapper-content']/section[6]/article[4]/h3/a/img @@ -246,7 +266,7 @@ clickAndWait - //div[@id='pageStart']/a + //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img @@ -271,7 +291,7 @@ clickAndWait - //div[@id='pageEnd']/a + //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img @@ -296,7 +316,17 @@ clickAndWait - //div[@id='year']/a + //div[@id='wrapper-content']/section[4]/article/h3/a/img + + + + assertTitle + Edit + + + + clickAndWait + //input[@id='submit' and @value='add a new item to this list'] @@ -306,8 +336,8 @@ type - tinymce - 2010 + name + 2010-10-27 clickAndWait @@ -321,7 +351,7 @@ clickAndWait - //div[@id='pmid']/a + //div[@id='wrapper-content']/section[5]/article[6]/h3/a/img @@ -346,7 +376,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img @@ -366,7 +396,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -391,7 +421,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -414,39 +444,9 @@ Too Much Nintendo - - comment - Validate unique field ISSUE - - clickAndWait - //div[@id='issue']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: issue - - - - clickAndWait - link=Cancel - - - - assertTitle - Too Much Nintendo - - - - clickAndWait - //div[@id='issue']/a + //div[@id='wrapper-content']/section[2]/article[1]/h3/a/img @@ -469,184 +469,9 @@ Too Much Nintendo - - comment - Validate unique field DATE - - clickAndWait - //div[@id='date']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: date - - - - verifyTextPresent - Use when a date doesn't signify a start date or end date, as with an award; can also be used when multiple independent dates are relevant - - - - verifyTextPresent - year - - - - verifyTextPresent - day - - - - clickAndWait - link=Cancel - - - - assertTitle - Too Much Nintendo - - - - clickAndWait - //div[@id='date']/a - - - - clickAndWait - submit - - - - assertTitle - Too Much Nintendo - - - - clickAndWait - //div[@id='date']/a - - - - assertTitle - Edit - - - - type - yeardateEdited - 2010 - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Please enter a valid month. Please enter a valid day. - - - - type - yeardateEdited - 2010 - - - select - monthdateEdited - label=October - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Please enter a valid day. - - - - type - yeardateEdited - 2010 - - - select - monthdateEdited - label=October - - - select - daydateEdited - label=27 - - - clickAndWait - submit - - - - assertTitle - Too Much Nintendo - - - - comment - Validate unique field DOI - - - - clickAndWait - //div[@id='doi']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: doi - - - - verifyTextPresent - The Digital Object Identifier (DOI) System provides for persistent identification of content objects in the digital environment. "DOI names are assigned to any entity for use on digital networks. They are used to provide current information, including where they (or information about them) can be found on the Internet. Information about a digital object may change over time, including where to find it, but its DOI name will not change." - - - - clickAndWait - link=Cancel - - - - assertTitle - Too Much Nintendo - - - - clickAndWait - //div[@id='doi']/a + //div[@id='wrapper-content']/section[5]/article[4]/h3/a @@ -669,176 +494,6 @@ Too Much Nintendo - - comment - Validate unique field EAN/UCC-13 - - - - clickAndWait - //div[@id='eanucc13']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: ean/ucc-13 - - - - verifyTextPresent - EAN International-Uniform Code Council (EAN-UCC) was a supply chain standards family name, formally the EAN.UCC System, that included product barcodes which are printed on the great majority of products available in stores worldwide and electronic commerce standards. - - - - clickAndWait - link=Cancel - - - - assertTitle - Too Much Nintendo - - - - clickAndWait - //div[@id='eanucc13']/a - - - - assertTitle - Edit - - - - type - tinymce - DEF12121212 - - - clickAndWait - submit - - - - assertTitle - Too Much Nintendo - - - - comment - Validate unique field NIH SUB ID - - - - clickAndWait - //div[@id='nihmsid']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: NIH Manuscript Submission System ID - - - - clickAndWait - link=Cancel - - - - assertTitle - Too Much Nintendo - - - - clickAndWait - //div[@id='nihmsid']/a - - - - assertTitle - Edit - - - - type - tinymce - NIH9898989898 - - - clickAndWait - submit - - - - assertTitle - Too Much Nintendo - - - - comment - Validate unique field PUBMED ID - - - - clickAndWait - //div[@id='pmcid']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: PubMed Central ID - - - - clickAndWait - link=Cancel - - - - assertTitle - Too Much Nintendo - - - - clickAndWait - //div[@id='pmcid']/a - - - - assertTitle - Edit - - - - type - tinymce - PMID767676 - - - clickAndWait - submit - - - - assertTitle - Too Much Nintendo - - comment Naviage back to Index @@ -911,7 +566,7 @@ verifyTextPresent - publications + research @@ -966,7 +621,7 @@ verifyTextPresent - Academic Article + academic article @@ -1009,11 +664,6 @@ 344 - - verifyTextPresent - 2010 - - verifyTextPresent 2010-10-27 @@ -1051,7 +701,7 @@ verifyTextPresent - Child Development | Subject Area + Child Development Subject Area diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html index e587d148..47dc9198 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html @@ -151,7 +151,7 @@ clickAndWait - //div[@id='authorInAuthorship']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -196,17 +196,37 @@ assertTitle + Furter, Frank + + + + verifyTextPresent + book + + + + verifyElementPresent + link=Nintendo: Good or Bad for Kids? + + + + verifyTextPresent Nintendo: Good or Bad for Kids? comment - Verify author info is there + Go back to the book - verifyElementPresent - link=Furter, Frank + clickAndWait + link=Nintendo: Good or Bad for Kids? + + + + assertTitle + Nintendo: Good or Bad for Kids? @@ -216,7 +236,7 @@ clickAndWait - //div[@id='publisher']/a + //div[@id='wrapper-content']/section[6]/article[7]/h3/a/img @@ -256,7 +276,7 @@ clickAndWait - //div[@id='placeOfPublication']/a + //div[@id='wrapper-content']/section[6]/article[8]/h3/a/img @@ -281,7 +301,7 @@ clickAndWait - //div[@id='status']/a + //div[@id='wrapper-content']/section[6]/article[11]/h3/a/img @@ -306,7 +326,17 @@ clickAndWait - //div[@id='year']/a + //div[@id='wrapper-content']/section[4]/article/h3/a/img + + + + assertTitle + Edit + + + + clickAndWait + //input[@id='submit' and @value='add a new item to this list'] @@ -316,8 +346,8 @@ type - tinymce - 2010 + name + 2009 clickAndWait @@ -331,32 +361,7 @@ clickAndWait - //div[@id='numPages']/a - - - - assertTitle - Edit - - - - type - tinymce - 258 - - - clickAndWait - submit - - - - assertTitle - exact:Nintendo: Good or Bad for Kids? - - - - clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img @@ -391,7 +396,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -416,7 +421,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -439,99 +444,9 @@ exact:Nintendo: Good or Bad for Kids? - - comment - Validate unique field LCCN - - clickAndWait - //div[@id='lccn']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: lccn - - - - verifyTextPresent - The Library of Congress Control Number or LCCN is a serially based system of numbering cataloging records in the Library of Congress in the United States. - - - - clickAndWait - link=Cancel - - - - assertTitle - exact:Nintendo: Good or Bad for Kids? - - - - clickAndWait - //div[@id='lccn']/a - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - exact:Nintendo: Good or Bad for Kids? - - - - comment - Validate unique field ISBN-10 - - - - clickAndWait - //div[@id='isbn10']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: isbn-10 - - - - verifyTextPresent - The International Standard Book Number (ISBN) is a unique[1][2] numeric commercial book identifier based upon the 9-digit Standard Book Numbering (SBN) code created by Gordon Foster. The 10-digit ISBN format was developed by the International Organization for Standardization and was published in 1970 as international standard ISO 2108. - - - - clickAndWait - link=Cancel - - - - assertTitle - exact:Nintendo: Good or Bad for Kids? - - - - clickAndWait - //div[@id='isbn10']/a + //div[@id='wrapper-content']/section[5]/article[3]/h3/a/img @@ -554,44 +469,9 @@ exact:Nintendo: Good or Bad for Kids? - - comment - Validate unique field ISBN-13 - - clickAndWait - //div[@id='isbn13']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: isbn-13 - - - - verifyTextPresent - The International Standard Book Number (ISBN) is a unique[1][2] numeric commercial book identifier based upon the 9-digit Standard Book Numbering (SBN) code created by Gordon Foster.Since 1 January 2007, ISBNs have contained 13 digits, a format that is compatible with Bookland EAN-13s. - - - - clickAndWait - link=Cancel - - - - assertTitle - exact:Nintendo: Good or Bad for Kids? - - - - clickAndWait - //div[@id='isbn13']/a + //div[@id='wrapper-content']/section[5]/article[5]/h3/a/img @@ -686,7 +566,7 @@ verifyTextPresent - publications + research @@ -731,12 +611,12 @@ verifyTextPresent - Book + book verifyTextPresent - Nintendo: Good or Bad for Kids? | Book + Nintendo: Good or Bad for Kids? @@ -766,7 +646,7 @@ verifyTextPresent - Putnam | Publisher + Putnam Publisher @@ -781,7 +661,7 @@ verifyTextPresent - in press | Document Status + in press Document Status @@ -801,7 +681,7 @@ verifyTextPresent - Child Development | Subject Area + Child Development Subject Area diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html index e1e8b7ab..8b5ce0ea 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html @@ -151,7 +151,7 @@ clickAndWait - //div[@id='authorInAuthorship']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -196,17 +196,37 @@ assertTitle + Furter, Frank + + + + verifyElementPresent + link=Nintendo O.K. for Kids + + + + verifyTextPresent + chapter + + + + verifyTextPresent Nintendo O.K. for Kids comment - Verify author info is there + Go back to Chapter - verifyElementPresent - link=Furter, Frank + clickAndWait + link=Nintendo O.K. for Kids + + + + assertTitle + Nintendo O.K. for Kids @@ -216,7 +236,7 @@ clickAndWait - //div[@id='editor']/a + //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img @@ -251,7 +271,7 @@ clickAndWait - //div[@id='pageStart']/a + //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img @@ -276,32 +296,7 @@ clickAndWait - //div[@id='chapter']/a - - - - assertTitle - Edit - - - - type - tinymce - 13 - - - clickAndWait - submit - - - - assertTitle - Nintendo O.K. for Kids - - - - clickAndWait - //div[@id='pageEnd']/a + //div[@id='wrapper-content']/section[2]/article[5]/h3/a @@ -326,7 +321,7 @@ clickAndWait - //div[@id='publisher']/a + //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img @@ -366,7 +361,7 @@ clickAndWait - //div[@id='placeOfPublication']/a + //div[@id='wrapper-content']/section[7]/article[8]/h3/a/img @@ -391,7 +386,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img @@ -411,7 +406,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img @@ -436,7 +431,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img @@ -531,7 +526,7 @@ verifyTextPresent - publications + research @@ -576,7 +571,7 @@ verifyTextPresent - Chapter + chapter diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html index 6d23eeb4..ee6a80bc 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html @@ -156,7 +156,7 @@ clickAndWait - //div[@id='authorInAuthorship']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -201,17 +201,37 @@ assertTitle + Furter, Frank + + + + verifyElementPresent + link=Nintendo Case Studies + + + + verifyTextPresent + conference paper + + + + verifyTextPresent Nintendo Case Studies comment - Verify author info is there + Go back to conference - verifyElementPresent - link=Furter, Frank + clickAndWait + link=Nintendo Case Studies + + + + assertTitle + Nintendo Case Studies @@ -221,7 +241,7 @@ clickAndWait - //div[@id='presentedAt']/a + //div[@id='wrapper-content']/section[2]/article[10]/h3/a/img @@ -256,7 +276,17 @@ clickAndWait - //div[@id='date']/a + //div[@id='wrapper-content']/section[4]/article/h3/a/img + + + + assertTitle + Edit + + + + clickAndWait + //input[@id='submit' and @value='add a new item to this list'] @@ -266,18 +296,8 @@ type - yeardateEdited - 2010 - - - select - monthdateEdited - label=April - - - select - daydateEdited - label=1 + name + 2010-04-01 clickAndWait @@ -291,7 +311,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img @@ -311,7 +331,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -336,7 +356,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -446,7 +466,7 @@ verifyTextPresent - publications + research @@ -484,16 +504,6 @@ Furter, Frank - - verifyElementPresent - link=View all VIVO publications and corresponding co-author network - - - - verifyTextPresent - View all VIVO publications and corresponding co-author network. - - verifyElementPresent link=Nintendo Case Studies @@ -501,12 +511,12 @@ verifyTextPresent - Conference Paper + conference paper verifyTextPresent - Nintendo Case Studies | Conference Paper + Nintendo Case Studies diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/CheckIndexView.html b/utilities/acceptance-tests/suites/AddPublicationsVB/CheckIndexView.html index cccf9f6d..837579f8 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/CheckIndexView.html @@ -104,21 +104,6 @@ Person (2) - - verifyTextPresent - topics - - - - verifyElementPresent - link=Subject Area - - - - verifyTextPresent - Subject Area (1) - - verifyTextPresent events @@ -161,7 +146,7 @@ verifyTextPresent - publications + research @@ -214,6 +199,16 @@ Conference Paper (1) + + verifyElementPresent + link=Subject Area + + + + verifyTextPresent + Subject Area (1) + + comment All done @@ -229,7 +224,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/CheckPublicView.html b/utilities/acceptance-tests/suites/AddPublicationsVB/CheckPublicView.html index 8b982b99..88a76ffc 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/CheckPublicView.html @@ -111,7 +111,12 @@ verifyTextPresent - Nintendo O.K. for Kids | Chapter + chapter + + + + verifyTextPresent + Nintendo O.K. for Kids @@ -121,17 +126,27 @@ verifyTextPresent - Nintendo Case Studies | Conference Paper - - - - verifyElementPresent - link=exact:Nintendo: Good or Bad for Kids? + conference paper verifyTextPresent - Nintendo: Good or Bad for Kids? | Book + Nintendo Case Studies + + + + verifyElementPresent + link=Nintendo: Good or Bad for Kids? + + + + verifyTextPresent + book + + + + verifyTextPresent + Nintendo: Good or Bad for Kids? @@ -141,7 +156,12 @@ verifyTextPresent - Too Much Nintendo | Academic Article + academic article + + + + verifyTextPresent + Too Much Nintendo @@ -171,7 +191,7 @@ verifyTextPresent - Sunny Sony | Faculty Member + Sunny Sony Faculty Member @@ -196,7 +216,7 @@ verifyTextPresent - Marcel Dekker | Publisher + Marcel Dekker Publisher @@ -211,7 +231,7 @@ verifyTextPresent - Child Development | Subject Area + Child Development Subject Area @@ -261,7 +281,7 @@ verifyTextPresent - Games and Child Development | Conference + Games and Child Development Conference @@ -276,7 +296,7 @@ verifyTextPresent - Child Development | Subject Area + Child Development Subject Area @@ -326,7 +346,7 @@ verifyTextPresent - Putnam | Publisher + Putnam Publisher @@ -341,7 +361,7 @@ verifyTextPresent - in press | Document Status + in press Document Status @@ -361,7 +381,7 @@ verifyTextPresent - Child Development | Subject Area + Child Development Subject Area @@ -434,11 +454,6 @@ 344 - - verifyTextPresent - 2010 - - verifyTextPresent 2010-10-27 @@ -476,7 +491,7 @@ verifyTextPresent - Child Development | Subject Area + Child Development Subject Area diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html index 280dc018..498bc322 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html @@ -109,16 +109,6 @@ Index to VIVO Contents - - comment - Verify that publications are already gone - - - - verifyTextNotPresent - publications - - comment Verify that everything else is still there @@ -126,7 +116,7 @@ verifyTextPresent - topics + research diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html index 699bde67..57985b01 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html @@ -119,11 +119,6 @@ people - - verifyTextPresent - topics - - verifyTextPresent events @@ -136,7 +131,7 @@ verifyTextPresent - publications + research diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html b/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html index 791eeb12..d599aca8 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html @@ -84,11 +84,6 @@ link=people - - verifyElementPresent - link=topics - - verifyElementPresent link=events @@ -101,7 +96,7 @@ verifyElementPresent - link=publications + link=research @@ -176,7 +171,7 @@ verifyElementPresent - link=exact:Nintendo: Good or Bad for Kids? + link=Nintendo: Good or Bad for Kids? @@ -214,11 +209,6 @@ child development - VIVO Search Results - - verifyElementPresent - link=topics - - verifyElementPresent link=events @@ -226,7 +216,7 @@ verifyElementPresent - link=publications + link=research @@ -311,7 +301,7 @@ verifyElementPresent - link=publications + link=research @@ -391,7 +381,7 @@ verifyElementPresent - link=publications + link=research @@ -479,11 +469,6 @@ Putnam | Publisher - - verifyTextPresent - publisher of Nintendo: Good or Bad for Kids? ... - - verifyElementPresent link=Marcel Dekker @@ -494,11 +479,6 @@ Marcel Dekker | Publisher - - verifyTextPresent - publisher of Nintendo O.K. for Kids ... - - comment Search for CONFERENCE @@ -519,11 +499,6 @@ conference - VIVO Search Results - - verifyElementPresent - link=topics - - verifyElementPresent link=events @@ -531,7 +506,7 @@ verifyElementPresent - link=publications + link=research diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html index d1fee038..f3f29848 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html @@ -141,7 +141,7 @@ clickAndWait - //div[@id='authorInAuthorship']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -181,7 +181,7 @@ clickAndWait - //div[@id='authorInAuthorship']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -306,7 +306,7 @@ assertTitle - Nintendo O.K. for Kids + Furter, Frank @@ -316,7 +316,17 @@ verifyElementPresent - link=Furter, Frank + link=Nintendo O.K. for Kids + + + + verifyTextPresent + Nintendo O.K. for Kids + + + + verifyTextPresent + chapter @@ -326,7 +336,12 @@ clickAndWait - link=add + link=Nintendo O.K. for Kids + + + + clickAndWait + //img[@alt='add'] @@ -361,7 +376,7 @@ clickAndWait - link=add + //img[@alt='add'] @@ -386,7 +401,7 @@ clickAndWait - link=add + //img[@alt='add'] @@ -421,7 +436,7 @@ clickAndWait - link=add + //img[@alt='add'] @@ -461,7 +476,7 @@ clickAndWait - //div[@id='dprop-vitro-links']/a + //img[@alt='add'] @@ -496,7 +511,7 @@ clickAndWait - //div[@id='dprop-vitro-links']/a + //img[@alt='add'] @@ -591,7 +606,7 @@ clickAndWait - //div[@id='informationResourceInAuthorship']/a + //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img @@ -626,7 +641,7 @@ clickAndWait - //div[@id='informationResourceInAuthorship']/a + //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img @@ -711,7 +726,7 @@ clickAndWait - //div[@id='editor']/a + //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img @@ -746,7 +761,7 @@ clickAndWait - //div[@id='editor']/a + //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img @@ -776,7 +791,7 @@ clickAndWait - //div[@id='volume']/a + //div[@id='wrapper-content']/section[7]/article[4]/h3/a/img @@ -806,7 +821,7 @@ clickAndWait - //div[@id='volume']/a + //div[@id='wrapper-content']/section[7]/article[4]/h3/a/img @@ -836,7 +851,7 @@ clickAndWait - //div[@id='number']/a + //div[@id='wrapper-content']/section[7]/article[5]/h3/a/img @@ -866,7 +881,7 @@ clickAndWait - //div[@id='number']/a + //div[@id='wrapper-content']/section[7]/article[5]/h3/a/img @@ -896,7 +911,7 @@ clickAndWait - //div[@id='pageStart']/a + //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img @@ -926,7 +941,7 @@ clickAndWait - //div[@id='pageStart']/a + //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img @@ -1016,7 +1031,7 @@ clickAndWait - //div[@id='pageEnd']/a + //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img @@ -1046,7 +1061,7 @@ clickAndWait - //div[@id='pageEnd']/a + //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img @@ -1076,7 +1091,7 @@ clickAndWait - //div[@id='features']/a + //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img @@ -1106,7 +1121,7 @@ clickAndWait - //div[@id='features']/a + //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img @@ -1136,7 +1151,7 @@ clickAndWait - //div[@id='publisher']/a + //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img @@ -1171,7 +1186,7 @@ clickAndWait - //div[@id='publisher']/a + //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img @@ -1206,7 +1221,7 @@ clickAndWait - //div[@id='publisher']/a + //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img @@ -1251,7 +1266,7 @@ clickAndWait - //div[@id='placeOfPublication']/a + //div[@id='wrapper-content']/section[7]/article[8]/h3/a/img @@ -1281,7 +1296,7 @@ clickAndWait - //div[@id='placeOfPublication']/a + //div[@id='wrapper-content']/section[7]/article[8]/h3/a/img @@ -1311,7 +1326,7 @@ clickAndWait - //div[@id='abstract']/a + //div[@id='wrapper-content']/section[2]/article[7]/h3/a/img @@ -1341,7 +1356,7 @@ clickAndWait - //div[@id='abstract']/a + //div[@id='wrapper-content']/section[2]/article[7]/h3/a/img @@ -1371,7 +1386,7 @@ clickAndWait - //div[@id='hasPublicationVenue']/a + //div[@id='wrapper-content']/section[2]/article[8]/h3/a/img @@ -1396,7 +1411,7 @@ clickAndWait - //div[@id='hasPublicationVenue']/a + //div[@id='wrapper-content']/section[2]/article[8]/h3/a/img @@ -1441,7 +1456,7 @@ clickAndWait - //div[@id='edition']/a + //div[@id='wrapper-content']/section[2]/article[9]/h3/a/img @@ -1471,7 +1486,7 @@ clickAndWait - //div[@id='edition']/a + //div[@id='wrapper-content']/section[2]/article[9]/h3/a/img @@ -1501,7 +1516,7 @@ clickAndWait - //div[@id='presentedAt']/a + //div[@id='wrapper-content']/section[2]/article[10]/h3/a/img @@ -1526,7 +1541,7 @@ clickAndWait - //div[@id='presentedAt']/a + //div[@id='wrapper-content']/section[2]/article[10]/h3/a/img @@ -1571,7 +1586,7 @@ clickAndWait - //div[@id='status']/a + //div[@id='wrapper-content']/section[7]/article[11]/h3/a/img @@ -1596,7 +1611,7 @@ clickAndWait - //div[@id='status']/a + //div[@id='wrapper-content']/section[7]/article[11]/h3/a/img @@ -1626,7 +1641,7 @@ clickAndWait - //div[@id='hasPart']/a + //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img @@ -1656,7 +1671,7 @@ clickAndWait - //div[@id='hasPart']/a + //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img @@ -1701,7 +1716,7 @@ clickAndWait - //div[@id='partOf']/a + //div[@id='wrapper-content']/section[3]/article/h3/a/img @@ -1736,7 +1751,7 @@ clickAndWait - //div[@id='partOf']/a + //div[@id='wrapper-content']/section[3]/article/h3/a/img @@ -1781,7 +1796,7 @@ clickAndWait - //div[@id='geographicFocus']/a + //div[@id='wrapper-content']/section[4]/article/h3/a/img @@ -1811,7 +1826,7 @@ clickAndWait - //div[@id='geographicFocus']/a + //div[@id='wrapper-content']/section[4]/article/h3/a/img @@ -1819,6 +1834,11 @@ Edit + + select + typeOfNew + label=Country (core) + select objectVar @@ -1841,7 +1861,7 @@ clickAndWait - //div[@id='year']/a + //div[@id='wrapper-content']/section[5]/article/h3/a/img @@ -1851,12 +1871,17 @@ verifyTextPresent - Add new entry for: year + Select an existing Date/Time Value for Nintendo O.K. for Kids verifyTextPresent - Use when start year and end year are not appropriate display level + There are no entries in the system to select from. + + + + verifyTextPresent + Please create a new entry. @@ -1871,7 +1896,7 @@ clickAndWait - //div[@id='year']/a + //div[@id='wrapper-content']/section[5]/article/h3/a/img @@ -1879,9 +1904,24 @@ Edit + + clickAndWait + submit + + + + assertTitle + Edit + + + + verifyTextPresent + Edit "date/time value" entry for Nintendo O.K. for Kids + + type - tinymce + name 2009 @@ -1894,86 +1934,6 @@ Nintendo O.K. for Kids - - comment - Add Year and Month, validating field first - - - - clickAndWait - //div[@id='yearMonth']/a - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: year and month - - - - verifyTextPresent - Use when a single year-month value is appropriate rather than a separate start and end display level - - - - clickAndWait - link=Cancel - - - - assertTitle - Nintendo O.K. for Kids - - - - clickAndWait - //div[@id='yearMonth']/a - - - - assertTitle - Edit - - - - type - tinymce - March 2009 - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Please correct this value: must be a valid year and month (YYYY-MM). - - - - type - tinymce - 2009-03 - - - clickAndWait - submit - - - - assertTitle - Nintendo O.K. for Kids - - comment Add OCLCNUM validating field first @@ -1981,7 +1941,7 @@ clickAndWait - //div[@id='oclcnum']/a + //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img @@ -2006,7 +1966,7 @@ clickAndWait - //div[@id='oclcnum']/a + //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img @@ -2036,7 +1996,7 @@ clickAndWait - //div[@id='pmid']/a + //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img @@ -2066,7 +2026,7 @@ clickAndWait - //div[@id='pmid']/a + //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img @@ -2151,7 +2111,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img @@ -2186,7 +2146,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img @@ -2221,7 +2181,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img @@ -2261,7 +2221,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img @@ -2291,7 +2251,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img @@ -2321,7 +2281,7 @@ clickAndWait - //div[@id='reproducedIn']/a + //div[@id='wrapper-content']/section[7]/article[9]/h3/a/img @@ -2351,7 +2311,7 @@ clickAndWait - //div[@id='reproducedIn']/a + //div[@id='wrapper-content']/section[7]/article[9]/h3/a/img @@ -2381,7 +2341,7 @@ clickAndWait - //div[@id='reproduces']/a + //div[@id='wrapper-content']/section[7]/article[10]/h3/a @@ -2406,7 +2366,7 @@ clickAndWait - //div[@id='reproduces']/a + //div[@id='wrapper-content']/section[7]/article[10]/h3/a @@ -2446,7 +2406,7 @@ verifyTextPresent - Company Homepage (primary link) + Company Homepage @@ -2461,7 +2421,7 @@ verifyTextPresent - Mouse, Minnie M | Person + Mouse, Minnie M @@ -2479,11 +2439,6 @@ 123 - - verifyTextPresent - 15 - - verifyTextPresent 144 @@ -2491,7 +2446,7 @@ verifyTextPresent - Mouse, Minnie M | Person + Mouse, Minnie M @@ -2501,7 +2456,7 @@ verifyTextPresent - Marcel Decker | Publisher + Marcel Decker Publisher @@ -2521,7 +2476,7 @@ verifyTextPresent - Raising Children in the 21st Century | Collection + Raising Children in the 21st Century Collection @@ -2536,7 +2491,7 @@ verifyTextPresent - Kids Now! | Conference + Kids Now! Conference @@ -2546,7 +2501,7 @@ verifyTextPresent - published | Document Status + published Document Status @@ -2556,7 +2511,7 @@ verifyTextPresent - Kids Now Conference Proceedings | Document Part + Kids Now Conference Proceedings Document Part @@ -2566,7 +2521,7 @@ verifyTextPresent - Nintendo: Good or Bad for Kids? | Book + Nintendo: Good or Bad for Kids? Book @@ -2579,11 +2534,6 @@ 2009 - - verifyTextPresent - 2009-03 - - verifyTextPresent 123456789 @@ -2594,6 +2544,11 @@ 1234-5678-90 + + verifyTextPresent + 15 + + verifyTextPresent 22 @@ -2606,7 +2561,7 @@ verifyTextPresent - Child Development | Subject Area + Child Development Subject Area @@ -2621,7 +2576,7 @@ verifyTextPresent - Nintendo: Good or Bad for Kids? | Book + Nintendo: Good or Bad for Kids? Book @@ -2631,7 +2586,7 @@ verifyTextPresent - Kids Now Conference Proceedings | Document Part + Kids Now Conference Proceedings Document Part @@ -2666,7 +2621,17 @@ verifyTextPresent - topics + research + + + + verifyTextPresent + Book (1) + + + + verifyTextPresent + Chapter (1) @@ -2699,21 +2664,6 @@ Publisher (1) - - verifyTextPresent - publications - - - - verifyTextPresent - Book (1) - - - - verifyTextPresent - Chapter (1) - - comment Navigate back to Frank Furter @@ -2754,6 +2704,11 @@ Verify Book Chapter is there + + verifyTextPresent + book section + + verifyElementPresent link=Nintendo O.K. for Kids @@ -2761,7 +2716,7 @@ verifyTextPresent - Nintendo O.K. for Kids | Chapter + Nintendo O.K. for Kids diff --git a/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles1.html b/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles1.html index 384354fb..5e4d0380 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles1.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles1.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='hasCo-PrincipalInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[4]/h3/a/img @@ -181,7 +181,7 @@ clickAndWait - //div[@id='hasCo-PrincipalInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[4]/h3/a/img @@ -339,11 +339,6 @@ 2009 - 2010 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li/span - - comment Add second Co-principal Investigator role @@ -351,7 +346,7 @@ clickAndWait - //div[@id='hasCo-PrincipalInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[4]/h3/a/img @@ -459,11 +454,6 @@ 2007 - 2009 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li[1]/span - - verifyElementPresent link=NIH VIVO @@ -474,11 +464,6 @@ 2009 - 2010 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li[2]/span - - comment Cancel out before adding Investigator @@ -486,7 +471,7 @@ clickAndWait - //div[@id='hasInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[5]/h3/a/img @@ -536,7 +521,7 @@ clickAndWait - //div[@id='hasInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[5]/h3/a/img @@ -694,11 +679,6 @@ 2009 - - verifyElementPresent - //div[@id='hasInvestigatorRole']/ul/li/span/a - - comment Add Principal Investigator role @@ -706,7 +686,7 @@ clickAndWait - //div[@id='hasPrincipalInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[3]/h3/a/img @@ -809,11 +789,6 @@ 2010 - - verifyElementPresent - //div[@id='hasPrincipalInvestigatorRole']/ul/li/span - - comment Verify that all grant roles are still there @@ -829,11 +804,6 @@ 2009 - 2010 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li/span - - verifyTextPresent VIVO Cornell Grant @@ -844,11 +814,6 @@ 2007 - 2009 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li[2]/span - - verifyTextPresent VIVO Cornell Grant Too @@ -859,11 +824,6 @@ 2009 - - verifyElementPresent - //div[@id='hasInvestigatorRole']/ul/li/span - - verifyTextPresent NIH VIVO Too @@ -874,11 +834,6 @@ 2010 - - verifyElementPresent - //div[@id='hasPrincipalInvestigatorRole']/ul/li/span - - comment Log out diff --git a/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles2.html index fe996147..805c3c73 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles2.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles2.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='hasResearcherRole']/a + //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img @@ -161,7 +161,7 @@ clickAndWait - //div[@id='hasResearcherRole']/a + //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img @@ -291,23 +291,13 @@ type - startYear - - - - clickAndWait - submit - - - - verifyTextPresent - This field must not be empty. - + startField.year + 2010 type - startYear - 2010 + endField.year + clickAndWait @@ -356,7 +346,7 @@ clickAndWait - //div[@id='hasResearcherRole']/a + //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img @@ -426,12 +416,12 @@ type - startYear + startField.year 1980 type - endYear + endField.year 1985 @@ -486,7 +476,7 @@ clickAndWait - //div[@id='hasTeacherRole']/a + //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img @@ -546,12 +536,12 @@ type - startYear + startField.year 2009 type - endYear + endField.year 2009 @@ -606,7 +596,7 @@ clickAndWait - //div[@id='hasTeacherRole']/a + //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img @@ -666,12 +656,12 @@ type - startYear + startField.year 2000 type - endYear + endField.year 2001 @@ -726,7 +716,7 @@ clickAndWait - //div[@id='hasTeacherRole']/a + //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img @@ -786,12 +776,12 @@ type - startYear + startField.year 2000 type - endYear + endField.year 2005 @@ -846,7 +836,7 @@ clickAndWait - //div[@id='hasClinicalRole']/a + //div[@id='wrapper-content']/section[3]/article[5]/h3/a/img @@ -916,12 +906,12 @@ type - startYear + startField.year 1990 type - endYear + endField.year 1991 @@ -976,7 +966,7 @@ clickAndWait - //div[@id='hasClinicalRole']/a + //div[@id='wrapper-content']/section[3]/article[5]/h3/a/img @@ -1046,12 +1036,12 @@ type - startYear + startField.year 1993 type - endYear + endField.year @@ -1104,11 +1094,6 @@ Verify activities displayed for Jane Faculty - - verifyElementPresent - link=Prototype New Ape Home - - verifyTextPresent Designer 1990 - 1991 diff --git a/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles1.html index 67b69cd9..fd3b3c09 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles1.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles1.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='hasPresenterRole']/a + //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img @@ -166,7 +166,7 @@ clickAndWait - //div[@id='hasPresenterRole']/a + //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img @@ -314,61 +314,6 @@ This field must not be empty. - - comment - Start to add presentation again, but enter only first 2 required fields - - - - verifyTextPresent - Create presentation entry for Librarian, Lily - - - - verifyTextPresent - Presentation Type - - - - verifyTextPresent - Presentation Name - - - - verifyTextPresent - Role in Presentation - - - - verifyTextPresent - Year - - - - type - relatedIndLabel - Researching Primates - - - type - roleLabel - Presenter - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - This field must not be empty. - - comment Add presentation correctly @@ -411,7 +356,7 @@ type - startYear + startField.year 2009 @@ -466,7 +411,7 @@ clickAndWait - //div[@id='hasPresenterRole']/a + //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img @@ -526,7 +471,7 @@ type - startYear + startField.year 2003 @@ -589,11 +534,6 @@ Member of panel 2003 - - verifyElementPresent - //div[@id='hasPresenterRole']/ul/li[1]/span - - verifyElementPresent link=Researching Primates @@ -604,11 +544,6 @@ Presenter 2009 - - verifyElementPresent - //div[@id='hasPresenterRole']/ul/li/span - - comment Add service to the profession - college @@ -616,7 +551,7 @@ clickAndWait - //div[@id='hasServiceProviderRole']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -676,9 +611,14 @@ type - startYear + startField.year 2010 + + type + endField.year + + clickAndWait submit @@ -731,7 +671,7 @@ clickAndWait - //div[@id='hasServiceProviderRole']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -791,12 +731,12 @@ type - startYear + startField.year 2001 type - endYear + endField.year 2003 @@ -859,11 +799,6 @@ Board 2001 - 2003 - - verifyElementPresent - //div[@id='hasServiceProviderRole']/ul/li[1]/span - - verifyTextPresent Carroll College @@ -874,11 +809,6 @@ Consultant 2010 - - - verifyElementPresent - //div[@id='hasServiceProviderRole']/ul/li[2]/span - - comment Add outreach and community service - committee @@ -886,7 +816,7 @@ clickAndWait - //div[@id='hasOutreachProviderRole']/a + //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img @@ -946,9 +876,14 @@ type - startYear + startField.year 2009 + + type + endField.year + + clickAndWait submit @@ -1001,7 +936,7 @@ clickAndWait - //div[@id='hasOutreachProviderRole']/a + //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img @@ -1061,12 +996,12 @@ type - startYear + startField.year 2001 type - endYear + endField.year 2001 @@ -1129,11 +1064,6 @@ Booth 2001 - - verifyElementPresent - //div[@id='hasOutreachProviderRole']/ul/li[1]/span - - verifyElementPresent link=Librarians for the Better Treatment of Primates @@ -1144,11 +1074,6 @@ Chair 2009 - - - verifyElementPresent - //div[@id='hasOutreachProviderRole']/ul/li[2]/span - - comment Log out diff --git a/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles2.html index 165ae38e..b16d38d0 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles2.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles2.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='hasLeaderRole']/a + //div[@id='wrapper-content']/section[3]/article[2]/h3/a/img @@ -191,9 +191,14 @@ type - startYear + startField.year 2009 + + type + endField.year + + clickAndWait submit @@ -246,7 +251,7 @@ clickAndWait - //div[@id='hasMemberRole']/a + //div[@id='wrapper-content']/section[3]/article[3]/h3/a/img @@ -306,9 +311,14 @@ type - startYear + startField.year 1988 + + type + endField.year + + clickAndWait submit @@ -369,11 +379,6 @@ Head Librarian 2009 - - - verifyElementPresent - //div[@id='hasLeaderRole']/ul/li/span - - verifyElementPresent link=Amercian Library Association @@ -384,11 +389,6 @@ Member 1988 - - - verifyElementPresent - //div[@id='hasMemberRole']/ul/li/span - - comment Log out diff --git a/utilities/acceptance-tests/suites/AddRolesVB/CheckIndexView.html b/utilities/acceptance-tests/suites/AddRolesVB/CheckIndexView.html index 768f26ea..a4177229 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/CheckIndexView.html @@ -186,12 +186,17 @@ verifyTextPresent - Museum (1) + Department (1) verifyTextPresent - Organization (5) + Group (1) + + + + verifyTextPresent + Organization (4) @@ -279,6 +284,11 @@ link=Department + + verifyElementPresent + link=Group + + verifyElementPresent link=Museum @@ -304,7 +314,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html index 0f19aa7d..1cebb9d0 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html @@ -190,13 +190,13 @@ - clickAndWait - link=Faculty + click + link=Faculty Member (1) assertTitle - Faculty + People diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html index 0fbd789a..5f32a0cb 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html @@ -136,7 +136,7 @@ clickAndWait - //div[@id='dprop-vitro-links']/a + //section[@id='share-contact']/nav[2]/h3[1]/a/img @@ -166,7 +166,7 @@ clickAndWait - //div[@id='overview']/a + //section[@id='individual-info']/h3[1]/a/img @@ -191,12 +191,7 @@ clickAndWait - //div[@id='hasCollaborator']/a - - - - pause - 10000 + //div[@id='wrapper-content']/section[3]/article[4]/h3/a/img @@ -216,7 +211,7 @@ clickAndWait - //div[@id='preferredTitle']/a + //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img @@ -241,7 +236,7 @@ clickAndWait - //div[@id='researchOverview']/a + //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img @@ -266,37 +261,7 @@ clickAndWait - //div[@id='hasResearchArea']/a - - - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - type - name - Monkeys - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='geographicFocus']/a + //div[@id='wrapper-content']/section[5]/article[6]/h3/a/img @@ -321,7 +286,7 @@ clickAndWait - //div[@id='advisorIn']/a + //div[@id='wrapper-content']/section[6]/article[3]/h3/a/img @@ -356,7 +321,7 @@ clickAndWait - //div[@id='teachingOverview']/a + //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img @@ -381,7 +346,7 @@ clickAndWait - //div[@id='outreachOverview']/a + //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img @@ -406,7 +371,7 @@ clickAndWait - //div[@id='adviseeIn']/a + //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img @@ -441,7 +406,7 @@ clickAndWait - //div[@id='awardOrHonor']/a + //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img @@ -471,7 +436,7 @@ clickAndWait - //div[@id='middleName']/a + //div[@id='wrapper-content']/section[9]/article[2]/h3/a/img @@ -496,7 +461,7 @@ clickAndWait - //div[@id='phoneNumber']/a + //section[@id='share-contact']/h3[3]/a/img @@ -521,7 +486,7 @@ clickAndWait - //div[@id='faxNumber']/a + //div[@id='wrapper-content']/section[9]/article[6]/h3/a/img @@ -546,7 +511,7 @@ clickAndWait - //div[@id='email']/a + //section[@id='share-contact']/h3[2]/a/img @@ -571,7 +536,7 @@ clickAndWait - //div[@id='mailingAddress']/a + //div[@id='wrapper-content']/section[9]/article[7]/h3/a/img @@ -601,7 +566,7 @@ clickAndWait - //div[@id='prefixName']/a + //div[@id='wrapper-content']/section[9]/article[4]/h3/a/img @@ -626,7 +591,7 @@ clickAndWait - //div[@id='suffixName']/a + //div[@id='wrapper-content']/section[9]/article[5]/h3/a/img @@ -651,7 +616,7 @@ clickAndWait - //div[@id='orcidId']/a + //div[@id='wrapper-content']/section[10]/article[1]/h3/a/img @@ -676,7 +641,7 @@ clickAndWait - //div[@id='scopusId']/a + //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img @@ -701,7 +666,7 @@ clickAndWait - //div[@id='researcherId']/a + //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img @@ -726,7 +691,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[11]/article/h3/a/img @@ -759,11 +724,6 @@ Mann Library Homepage - - verifyTextPresent - (primary link) - - verifyTextPresent I am named after Jane in the Tarzan stories. @@ -804,16 +764,6 @@ geographical_region - - verifyElementPresent - link=Monkeys - - - - verifyTextPresent - Subject Area - - verifyElementPresent link=Primates-R-Us Fellowship diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html index e7d37736..d763b1a1 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html @@ -136,7 +136,7 @@ clickAndWait - //div[@id='dprop-vitro-links']/a + //section[@id='share-contact']/nav[2]/h3[1]/a/img @@ -147,7 +147,7 @@ type url - http://cit.cornell.edu + http://cit.cprnell.edu type @@ -166,7 +166,7 @@ clickAndWait - //div[@id='geographicFocus']/a + //div[@id='wrapper-content']/section[5]/article[6]/h3/a/img @@ -191,37 +191,7 @@ clickAndWait - //div[@id='hasResearchArea']/a - - - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - type - name - Chimps - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='advisorIn']/a + //div[@id='wrapper-content']/section[6]/article[3]/h3/a/img @@ -256,42 +226,7 @@ clickAndWait - //div[@id='teaches']/a - - - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - - - type - name - Advanced Primates 301 - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='adviseeIn']/a + //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img @@ -326,7 +261,7 @@ clickAndWait - //div[@id='awardOrHonor']/a + //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img @@ -339,6 +274,11 @@ //input[@id='submit' and @value='add a new item to this list'] + + assertTitle + Edit + + type name @@ -356,7 +296,7 @@ clickAndWait - //div[@id='phoneNumber']/a + //section[@id='share-contact']/h3[3]/a/img @@ -381,7 +321,7 @@ clickAndWait - //div[@id='faxNumber']/a + //div[@id='wrapper-content']/section[9]/article[6]/h3/a/img @@ -406,7 +346,7 @@ clickAndWait - //div[@id='email']/a + //section[@id='share-contact']/h3[2]/a/img @@ -431,7 +371,7 @@ clickAndWait - //div[@id='mailingAddress']/a + //div[@id='wrapper-content']/section[9]/article[7]/h3/a/img @@ -444,6 +384,11 @@ //input[@id='submit' and @value='add a new item to this list'] + + assertTitle + Edit + + type name @@ -461,7 +406,7 @@ clickAndWait - //div[@id='orcidId']/a + //div[@id='wrapper-content']/section[10]/article[1]/h3/a/img @@ -486,7 +431,7 @@ clickAndWait - //div[@id='scopusId']/a + //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img @@ -511,7 +456,7 @@ clickAndWait - //div[@id='researcherId']/a + //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img @@ -536,7 +481,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[11]/article/h3/a/img @@ -569,21 +514,11 @@ link=CUL Homepage - - verifyTextPresent - (primary link) - - verifyElementPresent link=CIT Homepage - - verifyTextPresent - (additional link) - - verifyTextPresent I am named after Jane in the Tarzan stories. Yes, my last name really is faculty. @@ -624,26 +559,6 @@ link=Mozambique - - verifyElementPresent - link=Apes - - - - verifyTextPresent - Subject Area - - - - verifyElementPresent - link=Chimps - - - - verifyTextPresent - Subject Area - - verifyElementPresent link=Primate Foundation of Africa @@ -664,26 +579,6 @@ Advising Relationship - - verifyElementPresent - link=Advanced Primates 301 - - - - verifyTextPresent - Semester Class - - - - verifyElementPresent - link=Intermediate Primates 201 - - - - verifyTextPresent - Semester Class - - verifyTextPresent I teach apes how to communicate with humans. @@ -736,7 +631,7 @@ verifyTextPresent - Janette + Jane @@ -746,7 +641,7 @@ verifyTextPresent - Facultee + Faculty diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html index 3cf81e48..64e150bc 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html @@ -106,12 +106,12 @@ clickAndWait - link=Faculty + link=Faculty Member (1) assertTitle - Faculty + People @@ -144,24 +144,19 @@ Add new position for Testing Department - - click - link=add a new organization - - - - type - newOrgName - Testing Department - select - newOrgType + typeSelector label=Academic Department type - title + relatedIndLabel + Testing Department + + + type + positionTitle Full Professor @@ -171,9 +166,14 @@ type - startYear + startField.year 1998 + + type + endField.year + + clickAndWait submit diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html index ebbff065..f5097dda 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html @@ -106,22 +106,22 @@ verifyTextPresent - Librarians + Librarian clickAndWait - link=Librarians + link=Librarian (1) assertTitle - Librarians + People verifyTextPresent - Librarians + Librarian diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/BrowseIndex.html b/utilities/acceptance-tests/suites/CreatePeopleVB/BrowseIndex.html index ca0b748a..b134097f 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/BrowseIndex.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/BrowseIndex.html @@ -61,7 +61,7 @@ assertTitle - VIVO + Log in to VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html index 372a5d1c..fef145d8 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html @@ -181,7 +181,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -236,7 +236,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -266,7 +266,7 @@ verifyTextPresent - Current Photo + Photo Upload diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeLibrarianImage.html index b4dc736f..df854e1d 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeLibrarianImage.html @@ -96,7 +96,7 @@ comment - Navigate to Jane Faculty + Navigate to Lily Librarian @@ -136,12 +136,12 @@ comment - Select to edit Jane Faculty's image + Select to edit Lily Librarian's image clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -166,7 +166,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -191,7 +191,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -216,7 +216,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -251,7 +251,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -276,7 +276,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -299,11 +299,6 @@ Photo Upload - - verifyTextPresent - Current Photo - - verifyTextPresent Your profile photo will look like the image below. @@ -341,7 +336,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -391,7 +386,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html b/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html index 25d91afc..6ede7d55 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html @@ -101,7 +101,7 @@ clickAndWait - link=Faculty + link=Faculty Member (1) @@ -111,7 +111,7 @@ assertTitle - Faculty + People @@ -121,7 +121,7 @@ verifyTextPresent - Librarians + Librarian diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html index b0bba694..b8aca301 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html @@ -140,13 +140,8 @@ - click - link=delete - - - - assertConfirmation - Are you sure you want to delete your photo? + clickAndWait + //img[@alt='delete'] diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html index 77f5772a..fb6a499f 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html @@ -136,7 +136,157 @@ clickAndWait - link=delete + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + click + //img[@alt='delete'] + + + + assertConfirmation + Are you sure you want to delete your photo? + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + click + //img[@alt='delete'] + + + + assertConfirmation + Are you sure you want to delete your photo? + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + click + //img[@alt='delete'] + + + + assertConfirmation + Are you sure you want to delete your photo? + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + click + //img[@alt='delete'] + + + + assertConfirmation + Are you sure you want to delete your photo? + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + click + //img[@alt='delete'] + + + + assertConfirmation + Are you sure you want to delete your photo? + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + click + //img[@alt='delete'] + + + + assertConfirmation + Are you sure you want to delete your photo? @@ -156,7 +306,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -176,7 +326,7 @@ clickAndWait - //div[@id='overview']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -196,7 +346,7 @@ clickAndWait - //div[@id='preferredTitle']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -216,7 +366,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -236,7 +386,7 @@ clickAndWait - //div[@id='researchOverview']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -256,7 +406,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -276,7 +426,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -296,7 +446,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -316,7 +466,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -336,7 +486,7 @@ clickAndWait - //div[@id='teachingOverview']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -356,7 +506,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -376,7 +526,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -396,7 +546,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -416,7 +566,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -436,7 +586,7 @@ clickAndWait - //div[@id='outreachOverview']/a + //img[@alt='delete'] @@ -456,7 +606,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -476,7 +626,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -496,7 +646,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -516,7 +666,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -536,7 +686,7 @@ clickAndWait - //div[@id='firstName']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -556,7 +706,7 @@ clickAndWait - //div[@id='middleName']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -576,7 +726,7 @@ clickAndWait - //div[@id='lastName']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -596,7 +746,7 @@ clickAndWait - //div[@id='prefixName']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -616,7 +766,7 @@ clickAndWait - //div[@id='suffixName']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -636,7 +786,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -656,7 +806,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -676,7 +826,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -696,7 +846,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -716,7 +866,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -736,207 +886,7 @@ clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete + //img[@alt='delete'] @@ -964,21 +914,11 @@ link=CUL Homepage - - verifyTextNotPresent - (primary link) - - verifyElementNotPresent link=CIT Homepage - - verifyTextNotPresent - (additional link) - - verifyTextNotPresent I am named after Jane in the Tarzan stories. Yes, my last name really is faculty. @@ -1029,26 +969,6 @@ link=Mozambique - - verifyElementNotPresent - link=Apes - - - - verifyTextNotPresent - Subject Area - - - - verifyElementNotPresent - link=Chimps - - - - verifyTextNotPresent - Subject Area - - verifyElementNotPresent link=Primate Foundation of Africa @@ -1069,26 +989,6 @@ Advising Relationship - - verifyElementNotPresent - link=Advanced Primates 301 - - - - verifyTextNotPresent - Semester Class - - - - verifyElementNotPresent - link=Intermediate Primates 201 - - - - verifyTextNotPresent - Semester Class - - verifyTextNotPresent I teach apes how to communicate with humans. @@ -1139,21 +1039,11 @@ Award or Honor - - verifyTextNotPresent - Janette - - verifyTextNotPresent E. - - verifyTextNotPresent - Facultee - - verifyTextNotPresent 607-288-8888 diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html index 12d95754..ad73eeac 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html @@ -125,13 +125,8 @@ - click - link=delete - - - - assertConfirmation - Are you sure you want to delete your photo? + clickAndWait + //img[@alt='delete'] diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html index 0b673747..353ac648 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html @@ -136,7 +136,7 @@ clickAndWait - //div[@id='dprop-vitro-links']/ul/li/span/span/a[1] + //ul[@id='links-primary']/li/a[2]/img @@ -147,7 +147,7 @@ type url - http://library,cornell.edu + http://library.cornell.edu type @@ -166,7 +166,7 @@ clickAndWait - //div[@id='overview']/div/div/span/span/a[1] + //section[@id='individual-info']/p/a[1]/img @@ -191,7 +191,7 @@ clickAndWait - //div[@id='hasCollaborator']/ul/li/span/span/a[1] + //div[@id='wrapper-content']/section[3]/article[4]/ul/li/a[2]/img @@ -199,6 +199,11 @@ Edit + + select + objectVar + label=Faculty, Jane + clickAndWait submit @@ -211,7 +216,7 @@ clickAndWait - //div[@id='preferredTitle']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[3]/article[1]/ul/li/a[1]/img @@ -236,7 +241,7 @@ clickAndWait - //div[@id='researchOverview']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[5]/article[1]/ul/li/a[1]/img @@ -261,7 +266,7 @@ clickAndWait - //div[@id='geographicFocus']/ul/li/span/span/a[1] + //div[@id='wrapper-content']/section[5]/article[6]/ul/li/a[2]/img @@ -274,31 +279,6 @@ typeOfNew label=Country (core) - - select - objectVar - label=Mozambique - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='hasResearchArea']/ul/li/span/span/a[1] - - - - assertTitle - Edit - - clickAndWait //input[@id='submit' and @value='add a new item to this list'] @@ -312,7 +292,7 @@ type name - Apes + Mozambique clickAndWait @@ -326,7 +306,7 @@ clickAndWait - //div[@id='advisorIn']/ul/li/span/span/a[1] + //div[@id='wrapper-content']/section[6]/article[3]/ul/li/a[2]/img @@ -361,42 +341,7 @@ clickAndWait - //div[@id='teaches']/ul/li/span/span/a[1] - - - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - - - type - name - Intermediate Primates 201 - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='teachingOverview']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[6]/article[1]/ul/li/a[1]/img @@ -421,7 +366,7 @@ clickAndWait - //div[@id='outreachOverview']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[7]/article[1]/ul/li/a[1]/img @@ -446,7 +391,7 @@ clickAndWait - //div[@id='adviseeIn']/ul/li/span/span/a[1] + //div[@id='wrapper-content']/section[8]/article[3]/ul/li/a[2]/img @@ -481,7 +426,7 @@ clickAndWait - //div[@id='awardOrHonor']/ul/li/span/span/a[1] + //div[@id='wrapper-content']/section[8]/article[2]/ul/li/a[2]/img @@ -516,32 +461,7 @@ clickAndWait - //div[@id='firstName']/div/div/span/span/a[1] - - - - assertTitle - Edit - - - - type - tinymce - Janette - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='middleName']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[9]/article[2]/ul/li/a[1]/img @@ -566,32 +486,7 @@ clickAndWait - //div[@id='lastName']/div/div/span/span/a[1] - - - - assertTitle - Edit - - - - type - tinymce - Facultee - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='phoneNumber']/div/div/span/span/a[1] + //ul[@id='individual-phone']/li/a[1]/img @@ -616,7 +511,7 @@ clickAndWait - //div[@id='faxNumber']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[9]/article[6]/ul/li/a[1]/img @@ -641,7 +536,7 @@ clickAndWait - //div[@id='email']/div/div/span/span/a[1] + //section[@id='share-contact']/h3[2]/a/img @@ -666,7 +561,7 @@ clickAndWait - //div[@id='mailingAddress']/ul/li/span/span/a[1] + //div[@id='wrapper-content']/section[9]/article[7]/ul/li/a[2]/img @@ -701,7 +596,7 @@ clickAndWait - //div[@id='prefixName']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[9]/article[4]/ul/li/a[1]/img @@ -726,7 +621,7 @@ clickAndWait - //div[@id='suffixName']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[9]/article[5]/ul/li/a[1]/img @@ -751,7 +646,7 @@ clickAndWait - //div[@id='orcidId']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[10]/article[1]/ul/li/a[1]/img @@ -776,7 +671,7 @@ clickAndWait - //div[@id='scopusId']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[10]/article[3]/ul/li/a[1]/img @@ -801,7 +696,7 @@ clickAndWait - //div[@id='researcherId']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[10]/article[2]/ul/li/a[1]/img @@ -826,7 +721,7 @@ clickAndWait - //div[@id='freetextKeyword']/div/div/span/span/a[1] + //div[@id='wrapper-content']/section[11]/article/ul/li/a[1]/img @@ -859,11 +754,6 @@ link=CUL Homepage - - verifyTextPresent - (primary link) - - verifyTextPresent I am named after Jane in the Tarzan stories. Yes, my last name really is faculty. @@ -894,16 +784,6 @@ link=Mozambique - - verifyElementPresent - link=Apes - - - - verifyTextPresent - Subject Area - - verifyElementPresent link=Primate Foundation of Africa @@ -914,16 +794,6 @@ Advising Relationship - - verifyElementPresent - link=Intermediate Primates 201 - - - - verifyTextPresent - Semester Class - - verifyTextPresent I teach apes how to communicate with humans. @@ -956,7 +826,7 @@ verifyTextPresent - Janette + Jane @@ -966,7 +836,7 @@ verifyTextPresent - Facultee + Faculty diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/PublicFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/PublicFacultyInfo.html index a44a6ac6..21c2ea67 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/PublicFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/PublicFacultyInfo.html @@ -159,26 +159,6 @@ link=Mozambique - - verifyElementPresent - link=Apes - - - - verifyTextPresent - Subject Area - - - - verifyElementPresent - link=Chimps - - - - verifyTextPresent - Subject Area - - verifyElementPresent link=Primate Foundation of Africa @@ -199,26 +179,6 @@ Advising Relationship - - verifyElementPresent - link=Advanced Primates 301 - - - - verifyTextPresent - Semester Class - - - - verifyElementPresent - link=Intermediate Primates 201 - - - - verifyTextPresent - Semester Class - - verifyTextPresent I teach apes how to communicate with humans. @@ -269,21 +229,6 @@ Award or Honor - - verifyTextNotPresent - Janette - - - - verifyTextNotPresent - E. - - - - verifyTextNotPresent - Facultee - - verifyTextPresent 607-288-8888 diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/SearchFacultyInfo.html index 7c29f781..d7589a44 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/SearchFacultyInfo.html @@ -79,21 +79,6 @@ monkey - VIVO Search Results - - verifyElementPresent - link=topics - - - - verifyElementPresent - link=Monkeys - - - - verifyTextPresent - Subject Area - - verifyElementPresent link=Monkey Trainer of the Year @@ -129,21 +114,6 @@ link=people - - verifyElementPresent - link=topics - - - - verifyElementPresent - link=Apes - - - - verifyTextPresent - Subject Area - - verifyElementPresent link=Ape Trainer of the Decade @@ -189,41 +159,6 @@ link=people - - verifyElementPresent - link=courses - - - - verifyElementPresent - link=Introduction to Primates 101 - - - - verifyTextPresent - Semester Class - - - - verifyElementPresent - link=Intermediate Primates 201 - - - - verifyTextPresent - Semester Class - - - - verifyElementPresent - link=Advanced Primates 301 - - - - verifyTextPresent - Semester Class - - verifyElementPresent link=Faculty, Jane @@ -259,21 +194,6 @@ link=people - - verifyElementPresent - link=topics - - - - verifyElementPresent - link=Chimps - - - - verifyTextPresent - Subject Area - - verifyElementPresent link=Chimp Lover for Life @@ -454,6 +374,11 @@ link=Zambia + + verifyElementPresent + link=Zimbabwe + + verifyElementPresent link=South Africa @@ -469,11 +394,6 @@ special_group - - verifyElementPresent - link=Zimbabwe - - verifyElementPresent link=LIFDCs diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html index f44be885..557a546c 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html @@ -146,7 +146,7 @@ comment - Select to update this individual + Select to update this individual in the backend @@ -191,7 +191,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -236,7 +236,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -281,7 +281,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -391,7 +391,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -411,7 +411,7 @@ verifyTextPresent - Current Photo + Photo Upload diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadLibrarianImage.html index 0b668e09..41fbb495 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadLibrarianImage.html @@ -146,12 +146,12 @@ comment - Select to update this individual's picture + Select to update this individual's picture in the frontend clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a + //img[@alt='add'] @@ -176,7 +176,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -201,7 +201,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a + //img[@alt='add'] @@ -221,7 +221,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -246,7 +246,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a + //img[@alt='add'] @@ -266,7 +266,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -316,7 +316,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a + //img[@alt='add'] @@ -346,7 +346,7 @@ verifyTextPresent - The uploaded image should be at least 115 pixels high and 115 pixels wide. + The uploaded image should be at least 200 pixels high and 200 pixels wide. @@ -356,7 +356,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -396,7 +396,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -426,7 +426,7 @@ verifyTextPresent - Current Photo + Photo Upload diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html index acaff82e..d07738ec 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html @@ -114,6 +114,16 @@ Country + + clickAndWait + link=3 + + + + assertTitle + Country + + clickAndWait link=Germany @@ -126,7 +136,7 @@ verifyTextPresent - image + Photo @@ -151,7 +161,7 @@ clickAndWait - link=add + //img[@alt='add'] @@ -196,7 +206,7 @@ clickAndWait - link=add + //img[@alt='add'] @@ -256,7 +266,7 @@ clickAndWait - link=add + //img[@alt='add'] @@ -306,7 +316,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -326,12 +336,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img - - - - verifyElementPresent - link=Delete photo + //img[@alt='Individual photo'] @@ -371,7 +376,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -421,7 +426,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -476,17 +481,7 @@ clickAndWait - link=delete - - - - assertConfirmation - Are you sure you want to delete your photo? - - - - refreshAndWait - 10000 + //img[@alt='delete'] @@ -494,11 +489,6 @@ Germany - - verifyTextPresent - image - - comment Verify no image is present diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/lily1.jpg b/utilities/acceptance-tests/suites/CreatePeopleVB/lily1.jpg index 677212007117e30b5ebcf1007afb892ebc046f74..50f526ba33480e202996e5e8a250b12e03f9b418 100644 GIT binary patch literal 42412 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 PLMRFXQlel$YkU9MFDcY3 literal 4127 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 i1D23OVOXL3`WSeGGz delta 15752 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

++;3zDdJ;F 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Ξ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 S`i@*t4KV4t6u clickAndWait - //div[@id='content']/section[3]/article[1]/h3/a/img + //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img diff --git a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html index 6e8feb7d..622de508 100644 --- a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html @@ -146,7 +146,7 @@ clickAndWait - //div[@id='content']/section[3]/article/h3/a/img + //div[@id='wrapper-content']/section[3]/article/h3/a/img @@ -164,11 +164,6 @@ submit - - assertTitle - Edit - - type name diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html index 1f242e42..3c9613a8 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='educationalTraining']/a + //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img @@ -156,7 +156,7 @@ clickAndWait - //div[@id='educationalTraining']/a + //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img @@ -256,7 +256,12 @@ type - dateTime.year + startField.year + + + + type + endField.year 1980 @@ -279,6 +284,16 @@ Enter in new organization name + + type + startField.year + + + + type + endField.year + 1980 + select typeSelector @@ -331,12 +346,17 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, 1980 + B.S.in Business Administration, Carroll College 1980 + + + + verifyElementPresent + link=Carroll College clickAndWait - //div[@id='educationalTraining']/a + //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img @@ -386,18 +406,23 @@ type - dateTime.year + startField.year + 1998 + + + type + endField.year 2000 select typeSelector - label=College + label=University type relatedIndLabel - Carroll College + Carroll University type @@ -421,12 +446,22 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, 1980 + B.S.in Business Administration, Carroll College 1980 + + + + verifyElementPresent + link=Carroll College verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000 + M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + + + + verifyElementPresent + link=Carroll University @@ -436,7 +471,7 @@ clickAndWait - //div[@id='educationalTraining']/a + //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img @@ -456,8 +491,13 @@ type - dateTime.year - 2005 + startField.year + 2002 + + + type + endField.year + select @@ -516,17 +556,32 @@ verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship + B.S.in Business Administration, Carroll College 1980 + + + + verifyElementPresent + link=Carroll College verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, 1980 + M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + + + + verifyElementPresent + link=Carroll University verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000 + M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - + + + + verifyElementPresent + link=University of Wisconsin diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html index 9188b5d7..87c65ddc 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html @@ -136,17 +136,17 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, 1980 + B.S.in Business Administration, Carroll College 1980 verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000 + M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship + M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - @@ -156,7 +156,7 @@ clickAndWait - //div[@id='educationalTraining']/ul/li[3]/span/span/a[1] + //div[@id='wrapper-content']/section[8]/article[1]/ul/li[3]/a[2]/img @@ -171,7 +171,12 @@ type - dateTime.year + startField.year + + + + type + endField.year 1981 @@ -221,27 +226,27 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000 + M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship + M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - comment - Change organization for M.B.A. degree + Change department for M.B.A. degree clickAndWait - //div[@id='educationalTraining']/ul/li[2]/span/span/a[1] + //div[@id='wrapper-content']/section[8]/article[1]/ul/li[2]/a[2]/img @@ -251,13 +256,8 @@ type - newOrgName - University of Illinois - - - select - newOrgType - label=University + dept + Business Administration Department clickAndWait @@ -301,17 +301,17 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship + M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - @@ -321,7 +321,7 @@ clickAndWait - //div[@id='educationalTraining']/ul/li[1]/span/span/a[1] + //div[@id='wrapper-content']/section[8]/article[1]/ul/li[1]/a[2]/img @@ -381,17 +381,17 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005 + M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/CheckPublicView.html index 67d2c54c..e9b00386 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/CheckPublicView.html @@ -96,22 +96,27 @@ verifyTextPresent - educational training + Background verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005 + education and training verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 + + + + verifyTextPresent + B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html index 831a9f7c..be3acfd6 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html @@ -136,17 +136,17 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005 + B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 @@ -156,7 +156,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -176,7 +176,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -196,7 +196,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -221,17 +221,17 @@ verifyTextNotPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - verifyTextNotPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 verifyTextNotPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005 + B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 @@ -412,7 +412,7 @@ type querytext - illinois + carroll university clickAndWait @@ -421,17 +421,17 @@ assertTitle - illinois - VIVO Search Results + carroll university - VIVO Search Results clickAndWait - link=University of Illinois + link=Carroll University assertTitle - University of Illinois + Carroll University @@ -477,7 +477,7 @@ type querytext - illinois + carroll university clickAndWait @@ -486,12 +486,12 @@ assertTitle - illinois - VIVO Search Results + carroll university - VIVO Search Results verifyTextNotPresent - University of Illinois + Carroll University diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/SearchEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/SearchEducationBackground.html index 01eb7b93..25e31faa 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/SearchEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/SearchEducationBackground.html @@ -57,7 +57,7 @@ type querytext - carroll college + carroll clickAndWait @@ -66,7 +66,7 @@ assertTitle - carroll college - VIVO Search Results + carroll - VIVO Search Results @@ -74,6 +74,11 @@ link=Carroll College + + verifyElementPresent + link=Carroll University + + type querytext @@ -94,26 +99,6 @@ link=University of Wisconsin - - type - querytext - illinois - - - clickAndWait - //input[@value='Search'] - - - - assertTitle - illinois - VIVO Search Results - - - - verifyElementPresent - link=University of Illinois - - clickAndWait link=Home diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/AddPositions.html index 6774d640..54c5efc5 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/AddPositions.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='personInPosition']/a + //section[@id='individual-info']/header/h2/a/img @@ -161,7 +161,7 @@ clickAndWait - //div[@id='personInPosition']/a + //section[@id='individual-info']/header/h2/a/img @@ -236,9 +236,14 @@ type - startYear + startField.year 1971 + + type + endField.year + + clickAndWait submit @@ -256,7 +261,7 @@ verifyTextPresent - Carroll College Lecturer, 1971 - + Carroll College, Lecturer 1971 - @@ -266,7 +271,7 @@ clickAndWait - //div[@id='personInPosition']/a + //section[@id='individual-info']/header/h2/a/img @@ -277,17 +282,12 @@ select typeSelector - label=College + label=University type relatedIndLabel - Carroll College - - - click - ui-active-menuitem - + Carroll University type @@ -301,12 +301,12 @@ type - startYear + startField.year 1981 type - endYear + endField.year 1985 @@ -326,12 +326,12 @@ verifyTextPresent - Carroll College Lecturer, 1971 - + Carroll College, Lecturer 1971 - verifyTextPresent - Carroll College Assistant Professor, 1981 - 1985 + Carroll University, Assistant Professor 1981 - 1985 @@ -341,7 +341,7 @@ clickAndWait - //div[@id='personInPosition']/a + //section[@id='individual-info']/header/h2/a/img @@ -371,12 +371,12 @@ type - startYear + startField.year 1986 type - endYear + endField.year 2010 @@ -396,17 +396,17 @@ verifyTextPresent - Carroll College Lecturer, 1971 - + Carroll College, Lecturer 1971 - verifyTextPresent - Cornell University Assistant Professor, 1986 - 2010 + Carroll University, Assistant Professor 1981 - 1985 verifyTextPresent - Carroll College Assistant Professor, 1981 - 1985 + Carroll University, Assistant Professor 1981 - 1985 diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/ChangePositions.html index 61061d73..6771fb98 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/ChangePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/ChangePositions.html @@ -131,27 +131,27 @@ verifyTextPresent - Cornell University Assistant Professor, 1986 - 2010 + Carroll College, Lecturer 1971 - verifyTextPresent - Carroll College Assistant Professor, 1981 - 1985 + Carroll University, Assistant Professor 1981 - 1985 verifyTextPresent - Carroll College Lecturer, 1971 - + Carroll University, Assistant Professor 1981 - 1985 comment - Correct the dates of the lecturer position + Correct the dates of the Carroll College position clickAndWait - //div[@id='personInPosition']/ul/li[1]/span/span/a[1] + //ul[@id='individual-positions']/li[1]/a[2]/img @@ -161,12 +161,12 @@ type - startYear + startField.year 1977 type - endYear + endField.year 1981 @@ -211,27 +211,27 @@ verifyTextPresent - Cornell University Assistant Professor, 1986 - 2010 + Carroll College, Lecturer 1977 - 1981 verifyTextPresent - Carroll College Assistant Professor, 1981 - 1985 + Carroll University, Assistant Professor 1981 - 1985 verifyTextPresent - Carroll College Lecturer, 1977 - 1981 + Carroll University, Assistant Professor 1981 - 1985 comment - Change the organization for 1981-1985 Carroll College position + Change the title for Carroll University position clickAndWait - //div[@id='personInPosition']/ul/li[2]/span/span/a[1] + //ul[@id='individual-positions']/li[2]/a[2]/img @@ -241,13 +241,8 @@ type - newOrgName - Carroll University - - - select - newOrgType - label=University + positionTitle + Associate Professor clickAndWait @@ -291,27 +286,27 @@ verifyTextPresent - Cornell University Assistant Professor, 1986 - 2010 + Carroll College, Lecturer 1977 - 1981 verifyTextPresent - Carroll University Assistant Professor, 1981 - 1985 + Carroll University, Associate Professor 1981 - 1985 verifyTextPresent - Carroll College Lecturer, 1977 - 1981 + Cornell University, Assistant Professor 1986 - 2010 comment - Change Cornell University position to Carroll University + Change the title for Cornell University position clickAndWait - //div[@id='personInPosition']/ul/li[1]/span/span/a[1] + //ul[@id='individual-positions']/li[1]/a[2]/img @@ -319,19 +314,14 @@ Edit - - select - organizationUri - label=Carroll University - type - title + positionTitle Professor type - endYear + endField.year @@ -376,17 +366,17 @@ verifyTextPresent - Carroll University Professor, 1986 - + Carroll College, Lecturer 1977 - 1981 verifyTextPresent - Carroll University Assistant Professor, 1981 - 1985 + Carroll University, Associate Professor 1981 - 1985 verifyTextPresent - Carroll College Lecturer, 1977 - 1981 + Cornell University, Professor 1986 - diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/CheckPublicView.html index 9dfd5e26..052a7885 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/CheckPublicView.html @@ -96,22 +96,22 @@ verifyTextPresent - positions + Positions verifyTextPresent - Carroll University Assistant Professor, 1981 - 1985 + Cornell University, Professor 1986 - verifyTextPresent - Carroll College Lecturer, 1977 - 1981 + Carroll University, Associate Professor 1981 - 1985 verifyTextPresent - Carroll University Professor, 1986 - + Carroll College, Lecturer 1977 - 1981 diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html index 8f62edde..c2931a7f 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html @@ -131,7 +131,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -151,7 +151,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -171,7 +171,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -189,6 +189,11 @@ Faculty, Jane + + comment + Delete organizations one at a time + + clickAndWait link=Index @@ -199,11 +204,6 @@ Index to VIVO Contents - - comment - Delete organizations one at a time - - clickAndWait link=College diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/SearchPositions.html index 6b78bf8f..3654a425 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/SearchPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/SearchPositions.html @@ -71,7 +71,7 @@ verifyTextPresent - Search Results for 'lecturer' + Search results for 'lecturer' @@ -94,11 +94,6 @@ Carroll College | College - - verifyTextPresent - ... people Lecturer ... - - verifyElementPresent link=Faculty, Jane @@ -109,11 +104,6 @@ Faculty, Jane | Assistant Professor - - verifyTextPresent - ... positions Professor positions Lecturer positions Assistant Professor ... - - comment Search for professor, which should bring up Assistant Professor and Professor @@ -136,7 +126,7 @@ verifyTextPresent - Search Results for 'professor' + Search results for 'professor' @@ -159,11 +149,6 @@ Faculty, Jane | Assistant Professor - - verifyTextPresent - ... positions Professor positions Lecturer positions Assistant Professor ... - - verifyElementPresent link=Carroll University @@ -174,9 +159,14 @@ Carroll University | University + + verifyElementPresent + link=Cornell University + + verifyTextPresent - ... people Professor people Assistant Professor ... + Cornell University | University @@ -201,7 +191,7 @@ verifyTextPresent - Search Results for 'carroll' + Search results for 'carroll' @@ -231,7 +221,7 @@ comment - Link to Carroll College to verify Jane Faculty is no longer listed + Link to Carroll College to verify Jane Faculty is listed @@ -244,49 +234,19 @@ Carroll College - - type - querytext - carroll - - - clickAndWait - //input[@value='Search'] - - - - assertTitle - carroll - VIVO Search Results - - - - comment - Link to Carroll University to verify Jane Faculty is listed - - - - clickAndWait - link=Carroll University - - - - assertTitle - Carroll University - - verifyTextPresent - Faculty Position + faculty administrative position - assertElementPresent + verifyElementPresent link=Faculty, Jane verifyTextPresent - Faculty, Jane Professor, 1986 - + Faculty, Jane, Lecturer 1977 - 1981 @@ -311,7 +271,7 @@ verifyTextPresent - Search Results for 'university' + Search results for 'university' @@ -341,7 +301,42 @@ comment - Make sure Jane Faculty is no longer associated with Cornell + Make sure Jane Faculty is associated with Carroll and Cornell + + + + clickAndWait + link=Carroll University + + + + assertTitle + Carroll University + + + + verifyTextPresent + faculty position + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Faculty, Jane, Associate Professor 1981 - 1985 + + + + type + querytext + university + + + clickAndWait + //input[@value='Search'] @@ -355,10 +350,20 @@ - verifyElementNotPresent + verifyTextPresent + faculty position + + + + verifyElementPresent link=Faculty, Jane + + verifyTextPresent + Faculty, Jane, Professor 1986 - + + comment Go to home page