diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html index 1cebb9d0..f0040ff6 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html @@ -191,12 +191,12 @@ click - link=Faculty Member (1) + link=Faculty assertTitle - People + Faculty @@ -204,9 +204,14 @@ Verify Jane Faculty is within the Faculty class + + verifyElementPresent + link=Faculty, Jane + + verifyTextPresent - Faculty, Jane + Faculty, Jane | Assistant Professor diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html index 64e150bc..8f384944 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html @@ -106,12 +106,12 @@ clickAndWait - link=Faculty Member (1) + link=Faculty assertTitle - People + Faculty @@ -131,7 +131,7 @@ clickAndWait - //div[@id='personInPosition']/a + //h2[@id='personInPosition']/a/img @@ -189,9 +189,14 @@ Verify the new position is displayed two different ways + + verifyElementPresent + link=Testing Department + + verifyTextPresent - Testing Department Full Professor, 1998 - + Testing Department, Full Professor 1998 - @@ -226,7 +231,7 @@ verifyTextPresent - Testing Department Full Professor, 1998 - + Testing Department, Full Professor 1998 - diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html index f5097dda..a6ec8e6a 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html @@ -106,22 +106,17 @@ verifyTextPresent - Librarian + Librarians clickAndWait - link=Librarian (1) + link=Librarians assertTitle - People - - - - verifyTextPresent - Librarian + Librarians @@ -189,14 +184,64 @@ Verify that change took + + verifyElementPresent + link=Librarian, Lily + + verifyTextPresent - Librarian, Lily + Librarian, Lily | Assistant Librarian comment - Logou + Verify faculty view + + + + clickAndWait + link=People + + + + assertTitle + People + + + + clickAndWait + link=Faculty + + + + assertTitle + Faculty + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Faculty, Jane | Assistant Professor + + + + verifyElementPresent + link=Librarian, Lily + + + + verifyTextPresent + Librarian, Lily | Assistant Librarian + + + + comment + Logout diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AssociateLibToFac.html index d864f22d..e9d72dae 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AssociateLibToFac.html @@ -185,13 +185,23 @@ - verifyTextPresent - Librarian, Lily + verifyElementPresent + link=Faculty, Jane verifyTextPresent - Assistant Librarian + Faculty, Jane | Assistant Professor + + + + verifyElementPresent + link=Librarian, Lily + + + + verifyTextPresent + Librarian, Lily | Assistant Librarian diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html b/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html deleted file mode 100644 index 6ede7d55..00000000 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - -CheckPeopleLinks - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CheckPeopleLinks
deleteAllVisibleCookies
commentDouble check that all People links are correct
open/vivo/
assertTitleVIVO
commentMust not be logged in
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
clickAndWaitlink=People
assertTitlePeople
clickAndWaitlink=Faculty Member (1)
commentVerify that Lilly Librarian appears in Faculty and Librarians
assertTitlePeople
verifyTextPresentFaculty, Jane
verifyTextPresentLibrarian
verifyTextPresentLibrarian, Lily
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
- - diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html index ec67b3df..4483feba 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html @@ -104,26 +104,6 @@ Verify everything to be deleted is there - - verifyTextPresent - courses - - - - verifyTextPresent - Semester Class (3) - - - - verifyTextPresent - Course (3) - - - - verifyTextPresent - topics - - verifyTextPresent Subject Area (3) @@ -136,27 +116,17 @@ clickAndWait - link=Semester Class + link=African Primates assertTitle - Semester Class + African Primates clickAndWait - link=Advanced Primates 301 - - - - assertTitle - Advanced Primates 301 - - - - clickAndWait - link=edit this individual + link=Edit this individual @@ -181,151 +151,11 @@ assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. + Are you SURE you want to delete this individual? If in doubt, CANCEL. - pause - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Semester Class - - - - assertTitle - Semester Class - - - - clickAndWait - link=Intermediate Primates 201 - - - - assertTitle - Intermediate Primates 201 - - - - 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=Semester Class - - - - assertTitle - Semester Class - - - - clickAndWait - link=Introduction to Primates 101 - - - - assertTitle - Introduction to Primates 101 - - - - 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 + waitForPageToLoad 5000 @@ -356,17 +186,17 @@ clickAndWait - link=Apes + link=Primatia assertTitle - Apes + Primatia clickAndWait - link=edit this individual + link=Edit this individual @@ -391,11 +221,11 @@ assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. + Are you SURE you want to delete this individual? If in doubt, CANCEL. - pause + waitForPageToLoad 5000 @@ -426,17 +256,17 @@ clickAndWait - link=Chimps + link=Primatia Africana assertTitle - Chimps + Primatia Africana clickAndWait - link=edit this individual + link=Edit this individual @@ -461,81 +291,11 @@ assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. + Are you SURE you want to delete this individual? If in doubt, CANCEL. - pause - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Monkeys - - - - assertTitle - Monkeys - - - - 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 + waitForPageToLoad 5000 @@ -580,23 +340,8 @@ - verifyTextNotPresent - courses - - - - verifyTextNotPresent - Semester Class - - - - verifyTextNotPresent - Course - - - - verifyTextNotPresent - topics + assertTitle + Index to VIVO Contents @@ -604,11 +349,6 @@ Subject Area - - assertTitle - Index to VIVO Contents - - comment Log out diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html index 589df952..f84fcb6c 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html @@ -136,7 +136,7 @@ verifyTextPresent - Testing Department | Academic Department + Testing Department Academic Department @@ -186,7 +186,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -211,11 +211,11 @@ assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. + Are you SURE you want to delete this individual? If in doubt, CANCEL. - pause + waitForPageToLoad 5000 @@ -224,16 +224,6 @@ VIVO Site Administration - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - comment Take a break for indexing @@ -294,6 +284,11 @@ 10000 + + clickAndWait + link=Index + + verifyTextNotPresent organizations diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/Suite.html b/utilities/acceptance-tests/suites/CreatePeopleVB/Suite.html index 5bf1858e..08dc7d44 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/Suite.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/Suite.html @@ -1,33 +1,42 @@ - - - - - - Test Suite - - - - - - - - - - - - - - - - - - - - - - - - -
Test Suite
SetDefaultTheme
CreateFacultyMember
CreateLibrarian
AddFacultyInfo
EditFacultyInfo
AddFacultyInfo2
PublicFacultyInfo
SearchFacultyInfo
DeleteFacultyInfo
UploadFacultyImage
ChangeFacultyImage
VerifyImageDisplay
UploadLibrarianImage
ChangeLibrarianImage
SearchPeople
BrowseIndex
DeleteFacultyImage
DeleteLibrarianImage
DeleteTestPeople
UploadNonPersonImage
- - + + + + + + Test Suite + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Test Suite
SetDefaultTheme
CreateFacultyMember
CreateLibrarian
AddFacultyInfo
EditFacultyInfo
AddFacultyInfo2
PublicFacultyInfo
SearchFacultyInfo
DeleteFacultyInfo
UploadFacultyImage
ChangeFacultyImage
VerifyImageDisplay
UploadLibrarianImage
ChangeLibrarianImage
SetupTestTabs
AddFacultyClassAutolink
AddLibrarianClassAutolink
AddFacultyPosition
AssociateLibToFac
SearchPeople
BrowseIndex
DeleteFacultyImage
DeleteLibrarianImage
DeleteTestPeople
DeleteTestTabs
DeleteLibtoFacAssociation
DeleteTestOrganization
DeleteEverythingElse
UploadNonPersonImage
+ + diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/Suite_WITH_AUTOLINK.html b/utilities/acceptance-tests/suites/CreatePeopleVB/Suite_WITH_AUTOLINK.html deleted file mode 100644 index 9d13086f..00000000 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/Suite_WITH_AUTOLINK.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - Test Suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Test Suite
SetDefaultTheme
CreateFacultyMember
CreateLibrarian
AddFacultyInfo
EditFacultyInfo
AddFacultyInfo2
PublicFacultyInfo
SearchFacultyInfo
DeleteFacultyInfo
UploadFacultyImage
ChangeFacultyImage
VerifyImageDisplay
UploadLibrarianImage
ChangeLibrarianImage
SetupTestTabs
AddFacultyClassAutolink
AddLibrarianClassAutolink
AddFacultyPosition
AssociateLibToFac
CheckPeopleLinks
SearchPeople
BrowseIndex
DeleteFacultyImage
DeleteLibrarianImage
DeleteTestPeople
DeleteTestTabs
DeleteLibtoFacAssociation
DeleteTestOrganization
DeleteEverythingElse
UploadNonPersonImage
- - diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html index d07738ec..e9b57dde 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html @@ -144,11 +144,6 @@ Make sure no image exists - - verifyElementNotPresent - //img[@title='no image'] - - verifyTextNotPresent //img[@title='click to view larger image']