diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index dceb899c..b2517f8c 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -166,12 +166,7 @@ clickAndWait - //h2[@id='primaryLink']/a/img - - - - assertTitle - Edit + css=a.add-webpage > img.add-individual @@ -186,7 +181,7 @@ clickAndWait - submit + returnToIndividual diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html index 6709ed6f..8101015f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html @@ -189,6 +189,11 @@ submit + + clickAndWait + returnToIndividual + + assertTitle Faculty, Jane diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html index da370891..a91739be 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html @@ -99,6 +99,66 @@ VIVO Site Administration + + comment + Put Jane's title back + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-preferredTitle > img.add-individual + + + + assertTitle + Edit + + + + type + tinymce + Assistant Professor + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + comment Navigate to the core:Librarian in the ontology diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html index f27a7ef4..8cdec18c 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html @@ -124,26 +124,6 @@ //img[@title='click to view larger image']@src /vivo/file/*/thumbnail_Jane1.jpg - - comment - Select to edit Jane Faculty's profile - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - verifyTextPresent - Faculty, Jane - - comment Select to upload a new image but cancel out @@ -151,7 +131,7 @@ clickAndWait - //input[@value='Upload Image'] + css=img.edit-individual @@ -169,6 +149,11 @@ Current Photo + + verifyTextPresent + Replace Photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -196,11 +181,6 @@ assertTitle - Individual Control Panel - - - - verifyTextPresent Faculty, Jane @@ -211,7 +191,12 @@ clickAndWait - //input[@value='Upload Image'] + css=img.edit-individual + + + + assertTitle + Replace image for Faculty, Jane @@ -224,6 +209,11 @@ Current Photo + + verifyTextPresent + Replace Photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -254,11 +244,6 @@ Photo Upload - - verifyTextPresent - Photo Upload - - verifyTextPresent Your profile photo will look like the image below. @@ -276,7 +261,7 @@ assertTitle - Individual Control Panel + Faculty, Jane diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html index 378e443f..d09c7281 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html @@ -154,6 +154,11 @@ Current Photo + + verifyTextPresent + Replace Photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -204,6 +209,11 @@ Current Photo + + verifyTextPresent + Replace Photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -264,6 +274,11 @@ Current Photo + + verifyTextPresent + Replace Photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html index 43d17bef..fd0d711b 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Delete the uploaded picture for Jane Faculty in the backend diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index f24682da..2de13add 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -909,9 +909,14 @@ Faculty, Jane + + comment + Delete webpages + + clickAndWait - //img[@alt='delete'] + css=img.edit-individual @@ -920,28 +925,53 @@ - clickAndWait - submit + click + link=Delete - assertTitle - Faculty, Jane + assertConfirmation + Are you sure you want to remove this web page? + + + + waitForPageToLoad + 5000 + + + + click + link=Delete + + + + assertConfirmation + Are you sure you want to remove this web page? + + + + waitForPageToLoad + 5000 + + + + click + link=Delete + + + + assertConfirmation + Are you sure you want to remove this web page? + + + + waitForPageToLoad + 5000 clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit + returnToIndividual @@ -986,6 +1016,11 @@ verifyTextPresent + Faculty Member + + + + verifyTextNotPresent Assistant Professor diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html index e28297ee..9b871dae 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Delete Librarian-to-Faculty association diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html index 293df14e..2d43bc3f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Delete new people Jane Faculty and Lilly Librarian @@ -129,9 +134,14 @@ Individual Control Panel + + comment + Delete Jane Faculty + + clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -140,12 +150,7 @@ - comment - Delete Jane Faculty - - - - click + clickAndWait _delete @@ -199,9 +204,14 @@ Individual Control Panel + + comment + Delete Lilly Librarian + + clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -210,12 +220,7 @@ - comment - Delete Lilly Librarian - - - - click + clickAndWait _delete diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index f2440d48..a98dfd13 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -184,6 +184,16 @@ submit + + clickAndWait + returnToIndividual + + + + assertTitle + Faculty, Jane + + clickAndWait //section[@id='individual-info']/div/a[1]/img diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index 99b7ecb7..1e46a63a 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -89,11 +89,6 @@ link=people - - verifyElementPresent - link=Ape Trainer of the Decade - - verifyElementPresent link=Faculty, Jane @@ -101,7 +96,7 @@ verifyTextPresent - Assistant Professor + Faculty, Jane Assistant Professor @@ -140,13 +135,18 @@ - verifyTextPresent - Assistant Professor + verifyElementPresent + link=African Primates - verifyElementPresent - link=African Primates + verifyTextPresent + Faculty, Jane Assistant Professor + + + + verifyTextPresent + African Primates Subject Area @@ -174,11 +174,6 @@ link=people - - verifyElementPresent - link=Chimp Lover for Life - - verifyElementPresent link=Faculty, Jane @@ -186,7 +181,7 @@ verifyTextPresent - Assistant Professor + Faculty, Jane Assistant Professor @@ -221,7 +216,7 @@ verifyTextPresent - Assistant Professor + Faculty, Jane Assistant Professor @@ -281,7 +276,7 @@ verifyTextPresent - Assistant Professor + Faculty, Jane Assistant Professor @@ -359,11 +354,6 @@ link=people - - verifyElementPresent - link=L.H.D. Doctor of Humane Letters - - verifyElementPresent link=Faculty, Jane @@ -371,7 +361,7 @@ verifyTextPresent - Assistant Professor + Faculty, Jane Assistant Professor diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html b/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html index a7ddeaa8..d88e06b2 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html @@ -59,6 +59,11 @@ link=people + + verifyElementPresent + link=research + + verifyElementPresent link=Faculty, Jane @@ -66,12 +71,17 @@ verifyTextPresent - Faculty, Jane + Faculty, Jane Assistant Professor + + + + verifyElementPresent + link=Primatia verifyTextPresent - Assistant Professor + Primatia Subject Area @@ -99,6 +109,11 @@ link=people + + verifyElementPresent + link=research + + verifyElementPresent link=Faculty, Jane @@ -106,12 +121,27 @@ verifyTextPresent - Faculty, Jane + Faculty, Jane Assistant Professor + + + + verifyElementPresent + link=Librarian, Lily verifyTextPresent - Assistant Professor + Librarian, Lily Assistant Librarian + + + + verifyElementPresent + link=Primatia + + + + verifyTextPresent + Primatia Subject Area @@ -139,6 +169,11 @@ link=people + + verifyElementPresent + link=research + + verifyElementPresent link=Faculty, Jane @@ -146,12 +181,17 @@ verifyTextPresent - Faculty, Jane + Faculty, Jane Assistant Professor + + + + verifyElementPresent + link=Primatia verifyTextPresent - Assistant Professor + Primatia Subject Area @@ -186,12 +226,7 @@ verifyTextPresent - Librarian, Lily - - - - verifyTextPresent - Assistant Librarian + Librarian, Lily Assistant Librarian @@ -226,12 +261,7 @@ verifyTextPresent - Librarian, Lily - - - - verifyTextPresent - Assistant Librarian + Librarian, Lily Assistant Librarian @@ -266,12 +296,7 @@ verifyTextPresent - Librarian, Lily - - - - verifyTextPresent - Assistant Librarian + Librarian, Lily Assistant Librarian diff --git a/utilities/acceptance-tests/suites/CreatePeople/Suite.html b/utilities/acceptance-tests/suites/CreatePeople/Suite.html index 5c586b0e..2fde6eaf 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/Suite.html +++ b/utilities/acceptance-tests/suites/CreatePeople/Suite.html @@ -1,34 +1,34 @@ - - - - - - Test Suite - - - - - - - - - - - - - - - - - - - - - - - - - -
Test Suite
CreateFacultyMember
CreateLibrarian
AddFacultyInfo
EditFacultyInfo
AddFacultyInfo2
PublicFacultyInfo
SearchFacultyInfo
DeleteFacultyInfo
UploadFacultyImage
ChangeFacultyImage
VerifyImageDisplay
UploadLibrarianImage
ChangeLibrarianImage
AssociateLibToFac
SearchPeople
BrowseIndex
DeleteFacultyImage
DeleteLibrarianImage
DeleteTestPeople
DeleteLibtoFacAssociation
UploadNonPersonImage
- - + + + + + + Test Suite + + + + + + + + + + + + + + + + + + + + + + + + + +
Test Suite
CreateFacultyMember
CreateLibrarian
AddFacultyInfo
EditFacultyInfo
AddFacultyInfo2
PublicFacultyInfo
SearchFacultyInfo
DeleteFacultyInfo
UploadFacultyImage
ChangeFacultyImage
VerifyImageDisplay
UploadLibrarianImage
ChangeLibrarianImage
AssociateLibToFac
SearchPeople
BrowseIndex
DeleteFacultyImage
DeleteLibrarianImage
DeleteTestPeople
DeleteLibtoFacAssociation
UploadNonPersonImage
+ + diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html index bb4e8150..d2756e52 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html @@ -134,26 +134,6 @@ //img[@title='no image'] - - comment - Select to update this individual in the backend - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - verifyTextPresent - Faculty, Jane - - comment Select to upload an image @@ -161,7 +141,7 @@ clickAndWait - //input[@value='Upload Image'] + css=img.add-individual @@ -179,6 +159,11 @@ Current Photo + + verifyTextPresent + Upload a photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -196,7 +181,7 @@ assertTitle - Individual Control Panel + Faculty, Jane @@ -206,7 +191,7 @@ clickAndWait - //input[@value='Upload Image'] + css=img.add-individual @@ -224,6 +209,11 @@ Current Photo + + verifyTextPresent + Upload a photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -241,7 +231,7 @@ assertTitle - Individual Control Panel + Faculty, Jane @@ -251,7 +241,7 @@ clickAndWait - //input[@value='Upload Image'] + css=img.add-individual @@ -269,6 +259,11 @@ Current Photo + + verifyTextPresent + Upload a photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -296,7 +291,7 @@ assertTitle - Individual Control Panel + Faculty, Jane @@ -346,17 +341,7 @@ clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Upload Image'] + css=img.add-individual @@ -374,6 +359,11 @@ Current Photo + + verifyTextPresent + Upload a photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -416,7 +406,7 @@ assertTitle - Individual Control Panel + Faculty, Jane diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html index 077d7ac9..dafbdd4a 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html @@ -136,7 +136,7 @@ comment - Select to update this individual's picture in the frontend + Select to update this individual's picture @@ -144,11 +144,6 @@ //img[@alt='add'] - - comment - Select to upload an image - - assertTitle Upload image for Librarian, Lily @@ -164,6 +159,11 @@ Current Photo + + verifyTextPresent + Upload a photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -209,6 +209,11 @@ Current Photo + + verifyTextPresent + Upload a photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -254,6 +259,11 @@ Current Photo + + verifyTextPresent + Upload a photo (JPEG, GIF or PNG) + + verifyElementPresent //img[@alt='Individual photo'] @@ -336,12 +346,17 @@ verifyTextPresent - The uploaded image should be at least 200 pixels high and 200 pixels wide. + Current Photo verifyTextPresent - Current Photo + Upload a photo (JPEG, GIF or PNG) + + + + verifyTextPresent + The uploaded image should be at least 200 pixels high and 200 pixels wide. @@ -376,12 +391,17 @@ verifyTextPresent - Please upload an image smaller than 6 megabytes + Current Photo verifyTextPresent - Current Photo + Upload a photo (JPEG, GIF or PNG) + + + + verifyTextPresent + Please upload an image smaller than 6 megabytes