diff --git a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html new file mode 100644 index 00000000..9aacb7cd --- /dev/null +++ b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html @@ -0,0 +1,469 @@ + + + + + + +AddArticle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AddArticle
deleteAllVisibleCookies
setTimeout100000
commentChange grants to display
open/vivo/
assertTitleVIVO
commentMust not be logged in already
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as site admin
typeloginNametestAdmin@cornell.edu
typeloginPasswordPassword
clickAndWaitloginForm
commentNavigate to Index
clickAndWaitlink=Index
commentNavigate to Frank Furter
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
commentVerify grants exist
verifyTextPresentHistory of Apes in Africa Consultant 2010 -
verifyTextPresentHabitats for Apes Researcher 1980 - 1985
verifyTextPresentNIH VIVO Too 2010 -
verifyTextPresentNIH VIVO 2009 - 2010
verifyTextPresentVIVO Cornell Grant 2007 - 2009
verifyTextPresentVIVO Cornell Grant Too 2009
commentSelect display none
verifyTextPresent manage grants & projects
clickAndWaitid=manageGrantLink
assertTitleVIVO
verifyTextPresentNIH VIVO
verifyTextPresentVIVO Cornell Grant
verifyTextPresentVIVO Cornell Grant Too
verifyTextPresentNIH VIVO Too
verifyTextPresentHabitats for Apes
verifyTextPresentHistory of Apes in Africa
clickcss=input.grantCheckbox
clickxpath=(//input[@type='checkbox'])[2]
clickxpath=(//input[@type='checkbox'])[3]
clickxpath=(//input[@type='checkbox'])[4]
clickxpath=(//input[@type='checkbox'])[5]
clickxpath=(//input[@type='checkbox'])[6]
clickAndWaitlink=Return to profile page
assertTitleFaculty, Jane
commentVerify grants are gone
verifyTextNotPresentHistory of Apes in Africa Consultant 2010 -
verifyTextNotPresentHabitats for Apes Researcher 1980 - 1985
verifyTextNotPresentNIH VIVO Too 2010 -
verifyTextNotPresentNIH VIVO 2009 - 2010
verifyTextNotPresentVIVO Cornell Grant 2007 - 2009
verifyTextNotPresentVIVO Cornell Grant Too 2009
commentOpt to display 3 grants
verifyTextPresent manage grants & projects
clickAndWaitid=manageGrantLink
assertTitleVIVO
clickxpath=(//input[@type='checkbox'])[4]
clickxpath=(//input[@type='checkbox'])[2]
clickcss=input.grantCheckbox
clickAndWaitlink=Return to profile page
assertTitleFaculty, Jane
commentVerify only 3 grants are showing
verifyTextNotPresentHistory of Apes in Africa Consultant 2010 -
verifyTextNotPresentHabitats for Apes Researcher 1980 - 1985
verifyTextPresentNIH VIVO Too 2010 -
verifyTextPresentNIH VIVO 2009 - 2010
verifyTextPresentVIVO Cornell Grant 2007 - 2009
verifyTextNotPresentVIVO Cornell Grant Too 2009
commentNow display them all again
verifyTextPresentmanage grants & projects
clickAndWaitid=manageGrantLink
assertTitleVIVO
clickxpath=(//input[@type='checkbox'])[3]
clickxpath=(//input[@type='checkbox'])[5]
clickxpath=(//input[@type='checkbox'])[6]
clickAndWaitlink=Return to profile page
assertTitleFaculty, Jane
commentVerify grants all display again
verifyTextPresentHistory of Apes in Africa Consultant 2010 -
verifyTextPresentHabitats for Apes Researcher 1980 - 1985
verifyTextPresentNIH VIVO Too 2010 -
verifyTextPresentNIH VIVO 2009 - 2010
verifyTextPresentVIVO Cornell Grant 2007 - 2009
verifyTextPresentVIVO Cornell Grant Too 2009
commentLog out
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/AddRoles/suite.html b/utilities/acceptance-tests/suites/AddRoles/suite.html index 49b02c6a..93ff9697 100644 --- a/utilities/acceptance-tests/suites/AddRoles/suite.html +++ b/utilities/acceptance-tests/suites/AddRoles/suite.html @@ -17,9 +17,11 @@ AddLibrarianRoles1 AddLibrarianRoles2 AddFacultyMemberRoles3 +RebuildSearchIndex VerifyAllRolesSearchable CheckPublicView CheckIndexView +GrantDisplay CheckRepairMode DeleteTestFacultyMember DeleteTestLibrarian diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html index 6c5f15e8..bd11222d 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html @@ -262,7 +262,7 @@ type id=org - Car + Carr click diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html index fe1fe946..ac44a836 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html @@ -284,44 +284,69 @@ css=input.submit - - assertTitle - VIVO - - - - assertTitle - Edit - - - - clickAndWait - css=input.submit - - - - assertTitle - VIVO - - - - assertTitle - Edit - - - - clickAndWait - link=Cancel - - assertTitle Faculty, Jane + + comment + Verify awards are still listed correctly + + + + verifyTextPresent + Best Professor, conferred by Carroll College, 2002 + + + + verifyElementPresent + link=Best Professor + + + + verifyElementPresent + link=Carroll College + + + + verifyTextPresent + Professor of the Decade, conferred by Carroll College, 2010 + + + + verifyElementPresent + link=Professor of the Decade + + + + verifyElementPresent + link=Carroll College + + + + verifyTextPresent + Primate Expert, conferred by Primates-R-Us, 2004 - 2005 + + + + verifyElementPresent + link=Primate Expert + + + + verifyElementPresent + link=Primates-R-Us + + + + comment + Remove the year for the last award + + clickAndWait - xpath=(//img[@alt='edit'])[4] + css=a.edit-awardOrHonor > img.edit-individual @@ -337,86 +362,71 @@ type id=startField-year - 2004 + type id=endField-year - 2005 + clickAndWait css=input.submit - - assertTitle - VIVO - - - - assertTitle - Edit - - - - - - - - - comment - Verify positions are still listed correctly - - assertTitle Faculty, Jane - - verifyTextPresent - Assistant Professor, Cornell University 1986 - 2010 - - - - verifyTextPresent - Associate Professor, Carroll University 1981 - 1985 - - - - verifyTextPresent - Lecturer, Carroll College 1977 - 1981 - - comment - Change the title for Cornell University position + Verify awards are still listed correctly - clickAndWait - //section[@id='individual-info']/header/ul/li[1]/a[2]/img + verifyTextPresent + Best Professor, conferred by Carroll College, 2002 - assertTitle - Edit + verifyElementPresent + link=Best Professor - type - positionTitle - Professor - - - type - endField-year + verifyElementPresent + link=Carroll College - clickAndWait - submit + verifyTextPresent + Professor of the Decade, conferred by Carroll College + + + + verifyElementPresent + link=Professor of the Decade + + + + verifyElementPresent + link=Carroll College + + + + verifyTextPresent + Primate Expert, conferred by Primates-R-Us, 2004 - 2005 + + + + verifyElementPresent + link=Primate Expert + + + + verifyElementPresent + link=Primates-R-Us @@ -456,17 +466,17 @@ verifyTextPresent - Professor, Cornell University 1986 - + Best Professor, conferred by Carroll College, 2002 verifyTextPresent - Associate Professor, Carroll University 1981 - 1985 + Primate Expert, conferred by Primates-R-Us, 2004 - 2005 verifyTextPresent - Lecturer, Carroll College 1977 - 1981 + Professor of the Decade, conferred by Carroll College diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html b/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html index 540215cc..20983ee0 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html @@ -66,17 +66,32 @@ comment - Verify all 3 organization entries appear properly - - - - verifyElementPresent - link=College + Verify all entries appear properly verifyTextPresent - College (1) + activities + + + + verifyTextPresent + Award or Honor Receipt (3) + + + + verifyElementPresent + link=Award or Honor Receipt + + + + verifyTextPresent + organizations + + + + verifyTextPresent + Organization (2) @@ -86,17 +101,17 @@ verifyTextPresent - Organization (3) - - - - verifyElementPresent - link=University + research verifyTextPresent - University (2) + Award or Honor (3) + + + + verifyElementPresent + link=Award or Honor diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomAwardsForm/CheckPublicView.html index fe4682b5..a4e02144 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/CheckPublicView.html @@ -31,7 +31,7 @@ comment - Verify public view of Jane Faculty's positions + Verify public view of Jane Faculty's grants @@ -86,27 +86,62 @@ comment - Verify all 3 positions appear properly + Verify all 3 awards appear properly verifyTextPresent - Positions + Background verifyTextPresent - Professor, Cornell University 1986 - + awards and honors verifyTextPresent - Associate Professor, Carroll University 1981 - 1985 + Best Professor, conferred by Carroll College, 2002 + + + + verifyElementPresent + link=Best Professor + + + + verifyElementPresent + link=Carroll College verifyTextPresent - Lecturer, Carroll College 1977 - 1981 + Primate Expert, conferred by Primates-R-Us, 2004 - 2005 + + + + verifyElementPresent + link=Primate Expert + + + + verifyElementPresent + link=Primates-R-Us + + + + verifyTextPresent + Professor of the Decade, conferred by Carroll College + + + + verifyElementPresent + link=Professor of the Decade + + + + verifyElementPresent + link=Carroll College diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html index 1ce94bf0..266b0f1d 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html @@ -31,7 +31,7 @@ comment - Delete all positions setup for test faculty member + Delete all awards setup for test faculty member @@ -121,12 +121,12 @@ comment - Delete positions one at a time + Delete awards one at a time clickAndWait - css=a.delete-personInPosition > img.delete-individual + css=a.delete-awardOrHonor > img.delete-individual @@ -136,7 +136,7 @@ clickAndWait - submit + id=submit @@ -146,7 +146,7 @@ clickAndWait - css=a.delete-personInPosition > img.delete-individual + css=a.delete-awardOrHonor > img.delete-individual @@ -156,7 +156,7 @@ clickAndWait - submit + id=submit @@ -166,7 +166,7 @@ clickAndWait - css=a.delete-personInPosition > img.delete-individual + css=a.delete-awardOrHonor > img.delete-individual @@ -176,7 +176,7 @@ clickAndWait - submit + id=submit @@ -186,7 +186,7 @@ comment - Delete organizations one at a time + Delete index items one at a time @@ -196,12 +196,222 @@ clickAndWait - link=College + link=Award or Honor Receipt assertTitle - College + Award or Honor Receipt + + + + clickAndWait + link=Best Professor (Faculty, Jane - 2002) + + + + assertTitle + Best Professor (Faculty, Jane - 2002) + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Award or Honor Receipt + + + + assertTitle + Award or Honor Receipt + + + + clickAndWait + link=Primate Expert (Faculty, Jane) + + + + assertTitle + Primate Expert (Faculty, Jane) + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Award or Honor Receipt + + + + assertTitle + Award or Honor Receipt + + + + clickAndWait + link=Professor of the Decade (Faculty, Jane) + + + + assertTitle + Professor of the Decade (Faculty, Jane) + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Organization + + + + assertTitle + Organization @@ -226,7 +436,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -236,7 +446,7 @@ click - _delete + name=_delete @@ -246,7 +456,7 @@ waitForPageToLoad - 10000 + 5000 @@ -259,6 +469,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Organization @@ -271,12 +486,12 @@ clickAndWait - link=Carroll University + link=Primates-R-Us assertTitle - Carroll University + Primates-R-Us @@ -284,9 +499,14 @@ link=Edit this individual + + assertTitle + Individual Control Panel + + clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -296,7 +516,7 @@ click - _delete + name=_delete @@ -306,7 +526,7 @@ waitForPageToLoad - 10000 + 5000 @@ -319,24 +539,29 @@ link=Index - - clickAndWait - link=Organization - - assertTitle - Organization + Index of Contents clickAndWait - link=Cornell University + link=Award or Honor assertTitle - Cornell University + Award or Honor + + + + clickAndWait + link=Best Professor + + + + assertTitle + Best Professor @@ -344,9 +569,14 @@ link=Edit this individual + + assertTitle + Individual Control Panel + + clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -356,7 +586,7 @@ click - _delete + name=_delete @@ -366,7 +596,7 @@ waitForPageToLoad - 10000 + 5000 @@ -380,13 +610,148 @@ - refreshAndWait - 10000 + assertTitle + Index of Contents - verifyElementNotPresent - Organizations + clickAndWait + link=Award or Honor + + + + assertTitle + Award or Honor + + + + clickAndWait + link=Primate Expert + + + + assertTitle + Primate Expert + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Award or Honor + + + + assertTitle + Award or Honor + + + + clickAndWait + link=Professor of the Decade + + + + assertTitle + Professor of the Decade + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html index a2586c1d..033520c1 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html @@ -31,7 +31,7 @@ comment - Search for positions and organizations + Search for awards @@ -51,62 +51,7 @@ comment - Search for lecturer - - - - type - querytext - lecturer - - - clickAndWait - //input[@value='Search'] - - - - assertTitle - lecturer - VIVO Search Results - - - - verifyTextPresent - Search results for 'lecturer' - - - - verifyElementPresent - link=people - - - - verifyElementPresent - link=organizations - - - - verifyElementPresent - link=Carroll College - - - - verifyTextPresent - College - - - - verifyElementPresent - link=Faculty, Jane - - - - verifyTextPresent - Assistant Professor - - - - comment - Search for professor, which should bring up Assistant Professor and Professor + Search for professor @@ -136,67 +81,7 @@ verifyElementPresent - link=organizations - - - - verifyElementPresent - link=Faculty, Jane - - - - verifyTextPresent - Assistant Professor - - - - verifyElementPresent - link=Carroll University - - - - verifyTextPresent - University - - - - verifyElementPresent - link=Cornell University - - - - verifyTextPresent - University - - - - comment - Search for Carroll, which should bring up 2 organizations - - - - type - querytext - carroll - - - clickAndWait - //input[@value='Search'] - - - - assertTitle - carroll - VIVO Search Results - - - - verifyTextPresent - Search results for 'carroll' - - - - verifyElementPresent - link=people + link=activities @@ -204,6 +89,56 @@ link=organizations + + verifyElementPresent + link=research + + + + verifyTextPresent + Professor of the Decade Award or Honor + + + + verifyElementPresent + link=Professor of the Decade + + + + verifyTextPresent + Best Professor Award or Honor + + + + verifyElementPresent + link=Best Professor + + + + verifyTextPresent + Professor of the Decade (Faculty, Jane) Award or Honor Receipt + + + + verifyElementPresent + link=Professor of the Decade (Faculty, Jane) + + + + verifyTextPresent + Best Professor (Faculty, Jane - 2002) Award or Honor Receipt + + + + verifyElementPresent + link=Best Professor (Faculty, Jane - 2002) + + + + verifyTextPresent + Carroll College Organization + + verifyElementPresent link=Carroll College @@ -211,17 +146,7 @@ verifyTextPresent - College - - - - verifyElementPresent - link=Carroll University - - - - verifyTextPresent - University + Faculty, Jane Assistant Professor @@ -229,59 +154,29 @@ link=Faculty, Jane - - verifyTextPresent - Assistant Professor - - comment - Link to Carroll College to verify Jane Faculty is not listed - - - - clickAndWait - link=Carroll College - - - - assertTitle - Carroll College - - - - verifyElementNotPresent - link=Faculty, Jane - - - - verifyTextNotPresent - Faculty, Jane, Lecturer 1977 - 1981 - - - - comment - Search for university to find both Carroll and Cornell + Search for primate type - querytext - university + name=querytext + primate clickAndWait - //input[@value='Search'] + css=input.search assertTitle - university - VIVO Search Results + primate - VIVO Search Results verifyTextPresent - Search results for 'university' + Search results for 'primate' @@ -289,6 +184,11 @@ link=people + + verifyElementPresent + link=activities + + verifyElementPresent link=organizations @@ -296,82 +196,47 @@ verifyElementPresent - link=Cornell University - - - - verifyTextPresent - University + link=research verifyElementPresent - link=Carroll University + link=locations verifyTextPresent - University + Primate Expert Award or Honor - comment - Make sure Jane Faculty is associated with Carroll and Cornell - - - - clickAndWait - link=Carroll University - - - - assertTitle - Carroll University - - - - verifyElementNotPresent - link=Faculty, Jane - - - - verifyTextNotPresent - Faculty, Jane, Lecturer 1977 - 1981 - - - - type - querytext - university - - - clickAndWait - //input[@value='Search'] - - - - clickAndWait - link=Cornell University - - - - assertTitle - Cornell University + verifyElementPresent + link=Primate Expert verifyTextPresent - Affiliation + Primate Expert (Faculty, Jane) Award or Honor Receipt + + + + verifyElementPresent + link=Primate Expert (Faculty, Jane) verifyTextPresent - people + Primates-R-Us Organization + + + + verifyElementPresent + link=Primates-R-Us verifyTextPresent - faculty position + Faculty, Jane Assistant Professor @@ -379,11 +244,6 @@ link=Faculty, Jane - - verifyTextPresent - Faculty, Jane, Professor 1986 - - - comment Go to home page diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/Suite.html b/utilities/acceptance-tests/suites/CustomAwardsForm/Suite.html index a43b7f71..6194885c 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/Suite.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/Suite.html @@ -1,22 +1,23 @@ - - - - - - Test Suite - - - - - - - - - - - - - -
Test Suite
RebuildSearchIndex
CreateTestFacultyMember
AddAwards
ChangeAwards
SearchAwards
CheckPublicView
CheckIndexView
DeleteAwards
DeleteTestFacultyMember
- - + + + + + + Test Suite + + + + + + + + + + + + + + +
Test Suite
RebuildSearchIndex
CreateTestFacultyMember
AddAwards
ChangeAwards
RebuildSearchIndex
SearchAwards
CheckPublicView
CheckIndexView
DeleteAwards
DeleteTestFacultyMember
+ +