diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html index d6a276fe..ba0d343e 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html @@ -5,11 +5,29 @@ CheckIndexView + - + @@ -103,12 +121,17 @@ - + - + + + + + + @@ -218,7 +241,12 @@ - + + + + + + diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html index 735c10bf..688a2c9a 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html @@ -5,11 +5,29 @@ CheckPublicView +
CheckIndexView
CheckIndexView
comment
verifyTextPresentNon-Faculty Academic (1)Faculty Member (1)
verifyTextPresentPerson (1)Librarian (1)
verifyTextPresentPerson (2)
verifyElementPresentlink=Non-Faculty Academiclink=Faculty Member
verifyElementPresentlink=Librarian
- + @@ -51,40 +69,34 @@ - - - - - - - - + + - + - + + + + + + + + + + + - - - - - - - - - - - + @@ -97,7 +109,11 @@ - + + + + + @@ -108,7 +124,11 @@ - + + + + + @@ -141,7 +161,7 @@ - + @@ -224,7 +244,11 @@ - + + + + + @@ -235,7 +259,11 @@ - + + + + + @@ -356,7 +384,11 @@ - + + + + + @@ -367,7 +399,11 @@ - + + + + + @@ -520,7 +556,7 @@ - + @@ -543,7 +579,11 @@ - + + + + + @@ -554,7 +594,11 @@ - + + + + + @@ -805,7 +849,11 @@ - + + + + + @@ -816,7 +864,11 @@ - + + + + + @@ -842,21 +894,11 @@ - - - - - - - - - - @@ -889,7 +931,7 @@ - + @@ -897,6 +939,16 @@ + + + + + + + + + + @@ -904,7 +956,12 @@ - + + + + + + @@ -942,6 +999,11 @@ + + + + + @@ -1047,6 +1109,11 @@ + + + + + @@ -1137,7 +1204,11 @@ - + + + + + @@ -1148,7 +1219,11 @@ - + + + + + @@ -1229,7 +1304,11 @@ - + + + + + @@ -1240,7 +1319,11 @@ - + + + + + diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html index 05eeced9..04e702b2 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html @@ -756,7 +756,7 @@ - + diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index d589671f..daaff184 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -234,56 +234,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -334,31 +284,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -545,9 +470,9 @@ - - - + + + @@ -1264,21 +1189,11 @@ - - - - - - - - - - @@ -1311,7 +1226,7 @@ - + @@ -1331,7 +1246,12 @@ - + + + + + + @@ -1371,7 +1291,7 @@ - + diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html index 73b282f5..fb4642fc 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html @@ -421,7 +421,7 @@ - + diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html index deb79756..70c4ed21 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html @@ -156,22 +156,92 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index 0608ab0f..74c01ae9 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -5,11 +5,29 @@ VerifyAllThingsSearchable +
CheckPublicView
CheckPublicView
commentIndex to VIVO Contents
clickAndWaitlink=Non-Faculty Academic
assertTitleNon-Faculty AcademiccommentVerify People
clickAndWaitlink=ME Tarzanlink=Faculty Member
assertTitleME TarzanFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
verifyTextPresentPrimate College of America | College
verifyTextPresentPrimate College of America Dr., 1999 -
verifyTextPresentPrimate College of America | CollegePrimate College of America Dr., 1999 -
Introduction to Primate Health | Semester Class
commentGo back to Index
clickAndWait link=IndexIndex to VIVO Contents
commentVerify Courses
clickAndWait link=Course
verifyTextPresentME Tarzan | Non-Faculty AcademicFaculty, Jane | Assistant Professor
Primate Health | Subject Area
commentGo back to Index
clickAndWait link=IndexIndex to VIVO Contents
commentVerify Activities
clickAndWait link=GrantPrimate College of America | College
commentGo back to Index
clickAndWait link=IndexIndex to VIVO Contents
commentVerify Topics
clickAndWait link=Subject Area
verifyTextPresentME Tarzan | Non-Faculty AcademicFaculty, Jane | Assistant Professor
Elderly Care | Subject Area
commentGo back to Index
clickAndWait link=IndexIndex to VIVO Contents
commentVerify Events
clickAndWait link=Academic TermPrimate Health Conference | Conference
commentGo back to Index
clickAndWait link=IndexIndex to VIVO Contents
commentVerify Organizations
clickAndWait link=OrganizationThe Primate College of America is a privately-funded college for the study of primates.
verifyTextPresentME Tarzan | Non-Faculty Academic
verifyTextPresent Privately Funded | Process
verifyTextPresentME Tarzan | Non-Faculty Academic
verifyTextPresent B.S. Bachelor of Science | Academic Degree
verifyTextPresentD.V.M. Doctor of Veterinary Medicine | Academic DegreePrimate Student of the Year | Award or Honor
Portable Primate Habitat | Equipment
verifyTextPresentLaboratory
verifyTextPresentPrimate Research Laboratory | Laboratory
verifyTextPresent Primate History Library | Library
verifyTextPresentME Tarzan Dr., 1999 - Position
verifyTextPresentFaculty, Jane Dr., 1999 -
Primate Health Check Sponsor 2008 - 2010
verifyTextPresentnorthern Africa | geographical_region
verifyTextPresent info@primates.eduPrimate History Library
verifyTextPresentCollege
verifyTextPresent Primate College of America | CollegePrimate College of America Funding source 2010 -
commentGo back to Index
clickAndWait link=IndexIndex to VIVO Contents
commentVerify Equipment
clickAndWait link=EquipmentAnimal Diet
commentGo back to Index
clickAndWait link=IndexIndex to VIVO Contents
commentVerify Locations
clickAndWait link=Building
verifyTextPresentME Tarzan | Non-Faculty AcademicFaculty, Jane | Assistant Professor
Primate College of America
clickAndWait//div[@id='currentlyHeadedBy']/a
assertTitleEdit
verifyTextPresentSelect an existing Person for Primate College of America
selecttypeOfNewlabel=Non-Faculty Academic (core)
clickAndWaitsubmit
assertTitleEdit
verifyTextPresentEdit "currently headed by" entry for Primate College of America
typenameME Tarzan
clickAndWaitsubmit
assertTitlePrimate College of America
clickAndWait //div[@id='fundingAgentFor']/aPrimate College of America
clickAndWait//div[@id='memberRoleOf']/a
assertTitleEdit
verifyTextPresentAdd an entry to: member role of
clickAndWaitsubmit
assertTitlePrimate College of America
clickAndWait //div[@id='offersDegree']/a
selectobjectVarlabel=D.V.M. Doctor of Veterinary MedicineverifyTextPresentSelect an existing Award or Honor for Primate College of America
clickAndWaitThe Primate College of America is a privately-funded college for the study of primates.
verifyTextPresentME Tarzan | Non-Faculty Academic
verifyTextPresent Privately Funded | Process
verifyTextPresentME Tarzan | Non-Faculty Academic
verifyTextPresent B.S. Bachelor of Science | Academic Degree
verifyTextPresentD.V.M. Doctor of Veterinary Medicine | Academic DegreePrimate Student of the Year | Award or Honor
verifyTextPresentME Tarzan Dr., 1999 -Position
verifyTextPresentFaculty, Jane Dr., 1999 -
verifyTextPresentorthern Africa | geographical_regionnorthern Africa | geographical_region
verifyTextPresentME Tarzan | Non-Faculty AcademicFaculty, Jane | Assistant Professor
clickAndWaitlink=Non-Faculty Academiclink=Faculty Member
assertTitleNon-Faculty AcademicFaculty Member
clickAndWaitlink=ME Tarzanlink=Faculty, Jane
assertTitleME TarzanFaculty, Jane
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
waitForPageToLoad5000
assertTitleVIVO Site Administration
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Librarian
assertTitleLibrarian
clickAndWaitlink=Librarian, Lily
assertTitleLibrarian, Lily
- + @@ -98,127 +116,127 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -233,37 +251,32 @@ - + - + - + - + - + - - - - - - + diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html index 645dfc3e..e34bb045 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html @@ -1,35 +1,39 @@ - - - - - - Test Suite - - -
VerifyAllThingsSearchable
VerifyAllThingsSearchable
comment
verifyTextPresentPrimate Diet | Subject Area Primate Diet | Subject Area
verifyTextPresentPrimate History Library | Library Primate History Library | Library
verifyTextPresentPrimates-r-us | Organization Primates-r-us | Organization
verifyTextPresentPrimate Habitat Research Grant | Grant Primate Habitat Research Grant | Grant
verifyTextPresentPrimate Colleges of the World | Consortium Primate Colleges of the World | Consortium
verifyTextPresentPrimate Student of the Year | Award or Honor Primate Student of the Year | Award or Honor
verifyTextPresentPrimate Health and Fitness | Invited Talk Primate Health and Fitness | Invited Talk
verifyTextPresentPrimate Health Check | Event Primate Health Check | Event
verifyTextPresentPrimate Feeder | Equipment Primate Feeder | Equipment
verifyTextPresentPrimate Research Laboratory | Laboratory Primate Research Laboratory | Laboratory
verifyTextPresentPrimate Heart Health Clinic | Service Primate Heart Health Clinic | Service
verifyTextPresentPrimate Research Laboratory | Campus Primate Research Laboratory | Campus
verifyTextPresentME Tarzan | Non-Faculty Academic Faculty, Jane | Assistant Professor
verifyTextPresentPrimate Health | Subject Area Primate Health | Subject Area
verifyTextPresentAnimal Health | Subject Area Animal Health | Subject Area
verifyTextPresentPortable Primate Habitat | Equipment Portable Primate Habitat | Equipment
verifyTextPresentPrimate Research Lab Room 123 | Facility Primate Research Lab Room 123 | Facility
verifyTextPresentPrimate Elderly Care | Grant Primate Elderly Care | Grant
verifyTextPresentPrimate College of America | College Primate College of America | College
verifyTextPresentJane Memorial Building | Building Jane Memorial Building | Building
verifyTextPresentFall 2010 | Academic Term Fall 2010 | Academic Term
verifyTextPresentIntroduction to Primate Health | Semester Class Introduction to Primate Health | Semester Class
verifyTextPresentElderly Care | Subject Area Elderly Care | Subject Area
verifyTextPresentPrimate Health Conference | Conference Primate Health Conference | Conference
verifyTextPresentPrivately Funded | Process Privately Funded | Process
verifyTextPresentWinter 2011 | Academic Term Winter 2011 | Academic Term
verifyTextPresentNot sure | Vocabulary Source Reference Not sure | Vocabulary Source Reference
verifyTextPresentB.S. Bachelor of Science | Academic Degree B.S. Bachelor of Science | Academic Degree
verifyTextPresentD.V.M. Doctor of Veterinary Medicine | Academic Degree 1234 Northern African Nation | Address
verifyTextPresent1234 Northern African Nation | Address northern Africa | geographical_region
verifyTextPresentnorthern Africa | geographical_region
verifyTextPresentAfrica | geographical_region Africa | geographical_region
- + + + + + + Test Suite + + +
Test Suite
+ +href="CreateFacultyMember.html">CreateFacultyMember +href="CreateLibrarian.html">CreateLibrarian +href="CreateOrganization.html">CreateOrganization +href="CreateCourse.html">CreateCourse +href="CreateActivity.html">CreateActivity +href="CreateEvent.html">CreateEvent +href="CreateTopic.html">CreateTopic +href="CreateEquipment.html">CreateEquipment +href="CreateLocation.html">CreateLocation +href="VerifyAllThingsSearchable.html">VerifyAllThingsSearchable -
Test Suite
CreateOrganization
CreateCourse
CreateActivity
CreateEvent
CreateTopic
CreateEquipment
CreateLocation
VerifyAllThingsSearchable
CheckPublicView
CheckIndexView
DeleteIndexStuff
- - +href="CheckPublicView.html">CheckPublicView +CheckIndexView +DeleteIndexStuff + + + diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index c880e9e4..36391055 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -214,46 +214,6 @@ Faculty, Jane - - clickAndWait - //div[@id='currentlyHeadOf']/a - - - - assertTitle - Edit - - - - select - typeOfNew - label=Foundation (core) - - - clickAndWait - submit - - - - assertTitle - Edit - - - - type - name - Primates-R-Us - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - clickAndWait //div[@id='preferredTitle']/a @@ -854,11 +814,6 @@ Assistant Professor - - verifyElementPresent - link=Primates-R-Us - - verifyTextPresent Foundation diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html index 790e83ce..0c1f6f00 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html @@ -164,61 +164,6 @@ Faculty, Jane - - clickAndWait - //div[@id='hasCollaborator']/a - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='currentlyHeadOf']/a - - - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - - - type - name - Apes Rock - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - clickAndWait //div[@id='internationalGeographicFocus']/a @@ -654,26 +599,6 @@ Assistant Professor - - verifyElementPresent - link=Librarian, Lily - - - - verifyTextPresent - Assistant Librarian - - - - verifyElementPresent - link=Apes Rock - - - - verifyTextPresent - Academic Department - - verifyTextPresent Queen diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html index 666f881d..55af3951 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html @@ -187,7 +187,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg clickAndWait @@ -247,7 +247,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html index ef8e70fc..186cb54c 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html @@ -132,7 +132,7 @@ verifyAttribute //img[@title='click to view larger image']@src - /vivo/file/*/thumbnail_Lily1.jpg + /vivo/file/*/thumbnail_lily1.jpg comment @@ -172,7 +172,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Lily2.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily2.jpg clickAndWait @@ -222,7 +222,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Lily2.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily2.jpg clickAndWait @@ -282,7 +282,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Lily2.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily2.jpg clickAndWait @@ -332,7 +332,7 @@ verifyAttribute //img[@title='click to view larger image']@src - /vivo/file/*/thumbnail_Lily2.jpg + /vivo/file/*/thumbnail_lily2.jpg comment diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index 983159e6..0fcbf4ab 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -154,6 +154,26 @@ Faculty, Jane + + clickAndWait + link=delete + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + clickAndWait //div[@id='overview']/div/div/span/span/a[2] @@ -176,47 +196,7 @@ clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - link=delete + //div[@id='preferredTitle']/div/div/span/span/a[2] @@ -276,7 +256,7 @@ clickAndWait - //div[@id='internationalGeographicFocus']/ul/li[1]/span/span/a[2] + link=delete @@ -296,7 +276,7 @@ clickAndWait - //div[@id='internationalGeographicFocus']/ul/li/span/span/a[2] + link=delete @@ -316,7 +296,7 @@ clickAndWait - //div[@id='hasResearchArea']/ul/li[1]/span/span/a[2] + link=delete @@ -336,87 +316,7 @@ clickAndWait - //div[@id='hasResearchArea']/ul/li/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='advisorIn']/ul/li[1]/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='advisorIn']/ul/li/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='teaches']/ul/li[1]/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='teaches']/ul/li/span/span/a[2] + link=delete @@ -454,6 +354,86 @@ 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 //div[@id='outreachOverview']/div/div/span/span/a[2] @@ -476,7 +456,7 @@ clickAndWait - //div[@id='adviseeIn']/ul/li[1]/span/span/a[2] + link=delete @@ -496,7 +476,7 @@ clickAndWait - //div[@id='adviseeIn']/ul/li/span/span/a[2] + link=delete @@ -516,7 +496,7 @@ clickAndWait - //div[@id='awardOrDistinction']/ul/li[1]/span/span/a[2] + link=delete @@ -536,7 +516,7 @@ clickAndWait - //div[@id='awardOrDistinction']/ul/li/span/span/a[2] + link=delete @@ -614,166 +594,6 @@ Faculty, Jane - - clickAndWait - //div[@id='workPhone']/div/ul/li[1]/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='workPhone']/div/div/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='workFax']/div/ul/li[1]/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='workFax']/div/div/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='workEmail']/div/ul/li[1]/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='workEmail']/div/div/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='mailingAddress']/ul/li[1]/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='mailingAddress']/ul/li/span/span/a[2] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - clickAndWait //div[@id='prefixName']/div/div/span/span/a[2] @@ -816,7 +636,7 @@ clickAndWait - //div[@id='orcidId']/div/ul/li[1]/span/span/a[2] + link=delete @@ -836,7 +656,7 @@ clickAndWait - //div[@id='orcidId']/div/div/span/span/a[2] + link=delete @@ -856,7 +676,7 @@ clickAndWait - //div[@id='scopusId']/div/ul/li[1]/span/span/a[2] + link=delete @@ -876,7 +696,7 @@ clickAndWait - //div[@id='scopusId']/div/div/span/span/a[2] + link=delete @@ -896,7 +716,7 @@ clickAndWait - //div[@id='researcherId']/div/ul/li[1]/span/span/a[2] + link=delete @@ -916,7 +736,7 @@ clickAndWait - //div[@id='researcherId']/div/div/span/span/a[2] + link=delete @@ -936,7 +756,7 @@ clickAndWait - //div[@id='freetextKeyword']/div/ul/li[1]/span/span/a[2] + link=delete @@ -956,7 +776,147 @@ clickAndWait - //div[@id='freetextKeyword']/div/div/span/span/a[2] + 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 @@ -1044,16 +1004,6 @@ Assistant Librarian - - verifyElementNotPresent - link=Apes Rock - - - - verifyTextNotPresent - Academic Department - - verifyTextNotPresent Queen diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html index 41699dc0..ae579dc7 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html @@ -132,7 +132,7 @@ verifyAttribute //img[@title='click to view larger image']@src - /vivo/file/*/thumbnail_Lily2.jpg + /vivo/file/*/thumbnail_lily2.jpg comment diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html index 33dee922..4c47f17b 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html @@ -111,22 +111,17 @@ verifyTextPresent - Academic Department (3) + Academic Department (1) verifyTextPresent - Department (3) + Department (1) verifyTextPresent - Foundation (1) - - - - verifyTextPresent - Organization (4) + Organization (1) @@ -139,21 +134,6 @@ Organization - - verifyTextPresent - Apes Rock | Academic Department - - - - verifyTextPresent - Primates Rock and Roll | Academic Department - - - - verifyTextPresent - Primates-R-Us | Foundation - - verifyTextPresent Testing Department | Academic Department @@ -174,196 +154,6 @@ Organization - - clickAndWait - link=Apes Rock - - - - assertTitle - Apes Rock - - - - 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. - - - - pause - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Organization - - - - assertTitle - Organization - - - - clickAndWait - link=Primates Rock and Roll - - - - assertTitle - Primates Rock and Roll - - - - 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. - - - - pause - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Organization - - - - assertTitle - Organization - - - - clickAndWait - link=Primates-R-Us - - - - assertTitle - Primates-R-Us - - - - 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. - - - - pause - 5000 - - - - assertTitle - VIVO Site Administration - - clickAndWait link=Index diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index d967d93b..cb11c21b 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -209,41 +209,6 @@ Faculty, Jane - - clickAndWait - //div[@id='currentlyHeadOf']/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 - Primates Rock and Roll - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - clickAndWait //div[@id='preferredTitle']/div/div/span/span/a[1] @@ -914,16 +879,6 @@ Assistant Professor - - verifyElementPresent - link=Primates Rock and Roll - - - - verifyTextPresent - Academic Department - - verifyTextPresent Queen diff --git a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html index e47eda85..b438d2af 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html @@ -134,36 +134,6 @@ Assistant Professor - - verifyElementPresent - link=Librarian, Lily - - - - verifyTextPresent - Assistant Librarian - - - - verifyElementPresent - link=Apes Rock - - - - verifyTextPresent - Academic Department - - - - verifyElementPresent - link=Primates Rock and Roll - - - - verifyTextPresent - Academic Department - - verifyTextPresent Queen diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index 3382c762..954047a3 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -134,11 +134,6 @@ link=topics - - verifyElementPresent - link=organizations - - verifyElementPresent link=Apes @@ -199,21 +194,6 @@ link=courses - - verifyElementPresent - link=organizations - - - - verifyElementPresent - link=Primates-R-Us - - - - verifyTextPresent - Foundation - - verifyElementPresent link=Introduction to Primates 101 @@ -224,16 +204,6 @@ Semester Class - - verifyElementPresent - link=Primates Rock and Roll - - - - verifyTextPresent - Academic Department - - verifyElementPresent link=Intermediate Primates 201 @@ -539,11 +509,6 @@ organization - - verifyTextPresent - hasMember Mozambique - - comment Search for HUMAN diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html index 7329dbb1..df4f4f25 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html @@ -287,7 +287,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane1.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane1.jpg clickAndWait @@ -397,7 +397,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane1.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane1.jpg clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html index 739b6237..fc96a2ad 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html @@ -227,7 +227,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Lily1.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily1.jpg clickAndWait @@ -272,7 +272,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Lily1.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily1.jpg clickAndWait @@ -327,7 +327,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lilysmall.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lilysmall.jpg clickAndWait @@ -367,7 +367,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lilylarge.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lilylarge.jpg clickAndWait @@ -412,7 +412,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Lily1.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily1.jpg clickAndWait @@ -457,7 +457,7 @@ verifyAttribute //img[@title='click to view larger image']@src - /vivo/file/*/thumbnail_Lily1.jpg + /vivo/file/*/thumbnail_lily1.jpg comment diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html index f24fd54e..2be40bd3 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html @@ -114,6 +114,16 @@ Country + + clickAndWait + link=G + + + + assertTitle + Country + + clickAndWait link=Germany @@ -227,7 +237,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany1.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany1.jpg clickAndWait @@ -267,7 +277,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany1.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany1.jpg clickAndWait @@ -382,7 +392,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany2.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany2.jpg clickAndWait @@ -432,7 +442,7 @@ type datafile - C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany2.jpg + C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany2.jpg clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/lily1.jpg b/utilities/acceptance-tests/suites/CreatePeople/lily1.jpg index f7eaad26..67721200 100644 Binary files a/utilities/acceptance-tests/suites/CreatePeople/lily1.jpg and b/utilities/acceptance-tests/suites/CreatePeople/lily1.jpg differ diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html index 8f7d08b7..cbbc0a00 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html @@ -271,7 +271,7 @@ comment - Enter all required fields except start year + Enter in all fields except for end year @@ -294,26 +294,6 @@ title Lecturer - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - This field must not be empty. - - - - comment - Enter in all fields except for end year - - type startYear