diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html index 74da54dd..ebd15136 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html @@ -1024,7 +1024,7 @@ click - //div[@id='wrapper-content']/ul/li[10] + //div[@id='wrapper-content']/ul/li[18] diff --git a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html index 98c9bdd9..75d53a64 100644 --- a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html +++ b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html @@ -170,7 +170,7 @@ click - css=input.grantCheckbox + css=input.itemCheckbox @@ -267,7 +267,7 @@ click - css=input.grantCheckbox + css=input.itemCheckbox diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html index f63e51d0..147b37ed 100644 --- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html +++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html @@ -251,6 +251,11 @@ Search results for 'primate' + + verifyElementPresent + link=people + + verifyElementPresent link=events @@ -286,6 +291,11 @@ Librarians for the Better Treatment of Primates Committee + + verifyText + //div[@id='wrapper-content']/div/ul/li[6] + Librarian, Lily Associate Librarian ... Show Me the Primates! ... + verifyElementPresent link=Show Me the Primates! @@ -311,6 +321,11 @@ link=Librarians for the Better Treatment of Primates + + verifyElementPresent + link=Librarian, Lily + + type @@ -337,16 +352,6 @@ link=organizations - - verifyTextPresent - Librarian, Lily Associate Librarian - - - - verifyTextPresent - Librarians for the Better Treatment of Primates Committee - - verifyElementPresent link=Librarian, Lily @@ -357,6 +362,66 @@ link=Librarians for the Better Treatment of Primates + + verifyElementPresent + link=Reference Division + + + + verifyElementPresent + link=Show Me the Primates! + + + + verifyElementPresent + link=Primates of the World + + + + verifyElementPresent + link=Carroll College + + + + verifyElementPresent + link=Amercian Library Association + + + + verifyText + css=span.display-title + Associate Librarian + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Committee + + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/span + Department + + + verifyText + //div[@id='wrapper-content']/div/ul/li[4]/span + Association + + + verifyText + //div[@id='wrapper-content']/div/ul/li[5]/span + Museum + + + verifyText + //div[@id='wrapper-content']/div/ul/li[6]/span + College + + + verifyText + //div[@id='wrapper-content']/div/ul/li[7]/span + Association + type @@ -388,6 +453,16 @@ link=Animal Librarianship + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Conference + + + verifyElementPresent + link=USAIN Conference + + type @@ -404,11 +479,21 @@ Search results for 'carroll' + + verifyElementPresent + link=people + + verifyElementPresent link=organizations + + verifyElementPresent + link=Carroll College + + verifyTextPresent Carroll College College @@ -416,9 +501,14 @@ verifyElementPresent - link=Carroll College + link=Librarian, Lily + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Associate Librarian + type @@ -435,11 +525,21 @@ Search results for 'library' + + verifyElementPresent + link=people + + verifyElementPresent link=organizations + + verifyElementPresent + link=Amercian Library Association + + verifyTextPresent Amercian Library Association Association @@ -447,9 +547,14 @@ verifyElementPresent - link=Amercian Library Association + link=Librarian, Lily + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Associate Librarian + type @@ -542,6 +647,11 @@ Search results for 'poa' + + verifyElementPresent + link=events + + verifyTextPresent PoA Annual Conference Conference diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 0ed441b8..0a5715aa 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -107,11 +107,6 @@ - - selectWindow - null - - clickAndWait css=a.delete-RO_0000056 > img.delete-individual diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html index 7ed32182..27e5ad6f 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html @@ -107,6 +107,11 @@ link=locations + + verifyElementPresent + link=Wisconsin + + verifyTextPresent Wisconsin State or Province @@ -114,7 +119,7 @@ verifyElementPresent - link=Wisconsin + link=University of Wisconsin @@ -124,9 +129,14 @@ verifyElementPresent - link=University of Wisconsin + link=United States of America + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/span + Country + clickAndWait link=Home diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/Suite.html b/utilities/acceptance-tests/suites/CustomEducationForm/Suite.html index 8255c9cf..a566b5dd 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/Suite.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/Suite.html @@ -1,22 +1,22 @@ - - - - - - Test Suite - - - - - - - - - - - - - -
Test Suite
RebuildSearchIndex
CreateTestFacultyMember
AddEducationBackground
ChangeEducationBackground
SearchEducationBackground
CheckPublicView
CheckIndexView
DeleteEducationalBackground
DeleteTestFacultyMember
- - + + + + + + Test Suite + + + + + + + + + + + + + +
Test Suite
RebuildSearchIndex
CreateTestFacultyMember
AddEducationBackground
ChangeEducationBackground
SearchEducationBackground
CheckPublicView
CheckIndexView
DeleteEducationalBackground
DeleteTestFacultyMember
+ + diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html index 07fea3c1..1183dd27 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html @@ -35,24 +35,49 @@ clickAndWait - //input[@value='Search'] + css=input.search assertTitle - Search for 'lecturer' + lecturer - VIVO Search Results - verifyTextPresent - Search for 'lecturer' + verifyText + css=h2.searchResultsHeader + Search results for 'lecturer' + + + verifyElementPresent + link=people - verifyTextPresent - No matching results. + verifyElementPresent + link=organizations + + verifyElementPresent + link=Carroll College + + + + verifyText + css=span.display-title + College + + + verifyElementPresent + link=Faculty, Jane + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Assistant Professor + type @@ -80,8 +105,8 @@ - verifyTextPresent - Faculty, Jane Assistant Professor + verifyElementPresent + link=organizations @@ -89,6 +114,31 @@ link=Faculty, Jane + + verifyTextPresent + Assistant Professor + + + + verifyElementPresent + link=Carroll University + + + + verifyTextPresent + University + + + + verifyElementPresent + link=Cornell University + + + + verifyTextPresent + University + + type @@ -112,12 +162,12 @@ verifyElementPresent - link=organizations + link=people - verifyTextPresent - Carroll College College + verifyElementPresent + link=organizations @@ -127,7 +177,7 @@ verifyTextPresent - Carroll University University + Carroll College College @@ -135,6 +185,21 @@ link=Carroll University + + verifyTextPresent + Carroll University University + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/span + Assistant Professor + clickAndWait @@ -179,12 +244,12 @@ verifyElementPresent - link=organizations + link=people - verifyTextPresent - Carroll University University + verifyElementPresent + link=organizations @@ -194,7 +259,7 @@ verifyTextPresent - Cornell University University + Carroll University University @@ -202,6 +267,21 @@ link=Carroll University + + verifyTextPresent + Cornell University University + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/span + Assistant Professor + + + verifyElementPresent + link=Faculty, Jane + + clickAndWait diff --git a/utilities/acceptance-tests/suites/SearchTextDiscovery/DeleteStuff.html b/utilities/acceptance-tests/suites/SearchTextDiscovery/DeleteStuff.html index f15b7ddb..4bffb141 100644 --- a/utilities/acceptance-tests/suites/SearchTextDiscovery/DeleteStuff.html +++ b/utilities/acceptance-tests/suites/SearchTextDiscovery/DeleteStuff.html @@ -70,7 +70,399 @@ link=Index + + + verifyText + css=h2 + people + + + verifyElementPresent + link=Person + + + + verifyText + //div[@id='isotope-container']/div[2]/h2 + organizations + + + verifyElementPresent + link=Department + + + + verifyElementPresent + link=Organization + + + + verifyText + //div[@id='isotope-container']/div[3]/h2 + research + + + verifyElementPresent + link=Academic Article + + + + verifyElementPresent + link=Article + + + + verifyText + //div[@id='isotope-container']/div[4]/h2 + locations + + + verifyElementPresent + link=Continent + + + + verifyText + //div[@id='isotope-container']/div[4]/ul/li + Continent (8) + + + + clickAndWait + link=Person + + + + assertTitle + Person + + + + clickAndWait + link=Baker, Able + + + + assertTitle + Baker, Able + + + + 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=Department + + + + assertTitle + Department + + + + clickAndWait + link=Advanced Puttering + + + + assertTitle + Advanced Puttering + + + + 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=Academic Article + + + + assertTitle + Academic Article + + + + clickAndWait + link=Musings + + + + assertTitle + Musings + + + + 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=Continent + + + + assertTitle + Continent + + + + clickAndWait + link=Lemuria + + + + assertTitle + Lemuria + + + + 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 + + + + refreshAndWait + 5000 + + + + refreshAndWait + 5000 + + + + refreshAndWait + 5000 + + + + refreshAndWait + 5000 + + + + verifyElementNotPresent + link=Person + + + + verifyElementNotPresent + link=Department + + + + verifyElementNotPresent + link=Organization + + + + verifyElementNotPresent + link=Academic Article + + + + verifyElementNotPresent + link=Article + + + + verifyElementPresent + link=Continent + + + + verifyText + css=div.class-group.isotope-item > ul > li + Continent (7) + clickAndWait diff --git a/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html b/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html index 35dc60be..3422f341 100644 --- a/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html +++ b/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html @@ -65,11 +65,6 @@ - - selectWindow - null - - clickAndWait link=Site Admin