diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html index 372a5d1c..fef145d8 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html @@ -181,7 +181,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -236,7 +236,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -266,7 +266,7 @@ verifyTextPresent - Current Photo + Photo Upload diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html index b4dc736f..df854e1d 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html @@ -96,7 +96,7 @@ comment - Navigate to Jane Faculty + Navigate to Lily Librarian @@ -136,12 +136,12 @@ comment - Select to edit Jane Faculty's image + Select to edit Lily Librarian's image clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -166,7 +166,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -191,7 +191,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -216,7 +216,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -251,7 +251,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -276,7 +276,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -299,11 +299,6 @@ Photo Upload - - verifyTextPresent - Current Photo - - verifyTextPresent Your profile photo will look like the image below. @@ -341,7 +336,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -391,7 +386,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html index b0bba694..b8aca301 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html @@ -140,13 +140,8 @@ - click - link=delete - - - - assertConfirmation - Are you sure you want to delete your photo? + clickAndWait + //img[@alt='delete'] diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index df1d3771..b291c2b3 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -136,7 +136,7 @@ clickAndWait - link=delete + //section[@id='individual-info']/p/a[2]/img @@ -156,7 +156,7 @@ clickAndWait - link=delete + //ul[@id='individual-areas']/li[1]/a[3]/img @@ -176,7 +176,7 @@ clickAndWait - //div[@id='overview']/div/div/span/span/a[2] + //ul[@id='individual-areas']/li/a[3]/img @@ -196,7 +196,7 @@ clickAndWait - //div[@id='preferredTitle']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -216,7 +216,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -236,7 +236,7 @@ clickAndWait - //div[@id='researchOverview']/div/div/span/span/a[2] + //ul[@id='individual-phone']/li[1]/a[2]/img @@ -256,7 +256,7 @@ clickAndWait - link=delete + //ul[@id='individual-phone']/li/a[2]/img @@ -276,7 +276,7 @@ clickAndWait - link=delete + //ul[@id='links-primary']/li[1]/a[3]/img @@ -296,7 +296,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -316,7 +316,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -336,7 +336,7 @@ clickAndWait - //div[@id='teachingOverview']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -356,7 +356,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -376,7 +376,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -396,7 +396,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -416,7 +416,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -436,7 +436,7 @@ clickAndWait - //div[@id='outreachOverview']/a + //img[@alt='delete'] @@ -456,7 +456,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -476,7 +476,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -496,7 +496,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -516,7 +516,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -536,7 +536,7 @@ clickAndWait - //div[@id='middleName']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -556,7 +556,7 @@ clickAndWait - //div[@id='prefixName']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -576,7 +576,7 @@ clickAndWait - //div[@id='suffixName']/div/div/span/span/a[2] + //img[@alt='delete'] @@ -596,7 +596,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -616,7 +616,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -636,7 +636,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -656,7 +656,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -676,7 +676,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -696,7 +696,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -716,7 +716,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -736,7 +736,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -756,7 +756,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -776,7 +776,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -796,7 +796,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -816,7 +816,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -836,7 +836,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -856,7 +856,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -876,7 +876,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -896,7 +896,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -916,7 +916,7 @@ clickAndWait - link=delete + //div[@id='wrapper-content']/section[11]/article/ul/li/a[2] @@ -944,21 +944,11 @@ link=CUL Homepage - - verifyTextNotPresent - (primary link) - - verifyElementNotPresent link=CIT Homepage - - verifyTextNotPresent - (additional link) - - verifyTextNotPresent I am named after Jane in the Tarzan stories. Yes, my last name really is faculty. @@ -1099,21 +1089,11 @@ Award or Honor - - verifyTextNotPresent - Janette - - verifyTextNotPresent E. - - verifyTextNotPresent - Facultee - - verifyTextNotPresent 607-288-8888 diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html index 12d95754..ad73eeac 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html @@ -125,13 +125,8 @@ - click - link=delete - - - - assertConfirmation - Are you sure you want to delete your photo? + clickAndWait + //img[@alt='delete'] diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 9eaa1a86..493e41ea 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -239,15 +239,20 @@ Faculty, Jane + + clickAndWait + //div[@id='wrapper-content']/section[5]/article[1]/ul/li/a[1]/img + + assertTitle Edit - clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/ul/li/a[1]/img - + type + tinymce + I study apes, of course. clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html index f44be885..557a546c 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html @@ -146,7 +146,7 @@ comment - Select to update this individual + Select to update this individual in the backend @@ -191,7 +191,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -236,7 +236,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -281,7 +281,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -391,7 +391,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -411,7 +411,7 @@ verifyTextPresent - Current Photo + Photo Upload diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html index 0b668e09..41fbb495 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html @@ -146,12 +146,12 @@ comment - Select to update this individual's picture + Select to update this individual's picture in the frontend clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a + //img[@alt='add'] @@ -176,7 +176,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -201,7 +201,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a + //img[@alt='add'] @@ -221,7 +221,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -246,7 +246,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a + //img[@alt='add'] @@ -266,7 +266,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -316,7 +316,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a + //img[@alt='add'] @@ -346,7 +346,7 @@ verifyTextPresent - The uploaded image should be at least 115 pixels high and 115 pixels wide. + The uploaded image should be at least 200 pixels high and 200 pixels wide. @@ -356,7 +356,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -396,7 +396,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img + //img[@alt='Individual photo'] @@ -426,7 +426,7 @@ verifyTextPresent - Current Photo + Photo Upload diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html index acaff82e..d07738ec 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html @@ -114,6 +114,16 @@ Country + + clickAndWait + link=3 + + + + assertTitle + Country + + clickAndWait link=Germany @@ -126,7 +136,7 @@ verifyTextPresent - image + Photo @@ -151,7 +161,7 @@ clickAndWait - link=add + //img[@alt='add'] @@ -196,7 +206,7 @@ clickAndWait - link=add + //img[@alt='add'] @@ -256,7 +266,7 @@ clickAndWait - link=add + //img[@alt='add'] @@ -306,7 +316,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -326,12 +336,7 @@ verifyElementPresent - //div[@id='photoUploadDefaultImageContainer']/img - - - - verifyElementPresent - link=Delete photo + //img[@alt='Individual photo'] @@ -371,7 +376,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -421,7 +426,7 @@ clickAndWait - //div[@id='dprop-vitro-image']/div/div/div/span/a[1] + //img[@alt='edit'] @@ -476,17 +481,7 @@ clickAndWait - link=delete - - - - assertConfirmation - Are you sure you want to delete your photo? - - - - refreshAndWait - 10000 + //img[@alt='delete'] @@ -494,11 +489,6 @@ Germany - - verifyTextPresent - image - - comment Verify no image is present diff --git a/utilities/acceptance-tests/suites/CreatePeople/lily1.jpg b/utilities/acceptance-tests/suites/CreatePeople/lily1.jpg index 67721200..50f526ba 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/CreatePeople/lily4.gif b/utilities/acceptance-tests/suites/CreatePeople/lily4.gif index 79cca2c9..b5b33fe8 100644 Binary files a/utilities/acceptance-tests/suites/CreatePeople/lily4.gif and b/utilities/acceptance-tests/suites/CreatePeople/lily4.gif differ