diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index e76bec87..e19eba76 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -184,16 +184,6 @@ Edit - - clickAndWait - link=Return to Manage Concepts - - - - assertTitle - Edit - - clickAndWait link=Return diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 1c5d034c..9b96ce18 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -144,6 +144,11 @@ Edit + + click + link=Remove + + click id=showAddFormButton @@ -174,26 +179,11 @@ Edit - - clickAndWait - link=Return to Manage Concepts - - - - assertTitle - Edit - - clickAndWait link=Return - - assertTitle - Edit - - assertTitle Faculty, Jane @@ -594,6 +584,11 @@ Edit + + waitForElementPresent + tinymce + + type tinymce diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html index 099e75b7..7cacf8a4 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html @@ -166,7 +166,7 @@ verifyTextPresent - This field must not be empty. + Please select a value in the Organization Type field. Please enter or select a value in the Name field. @@ -191,7 +191,7 @@ verifyTextPresent - This field must not be empty. + Please select a value in the Organization Type field. Please enter or select a value in the Name field. @@ -221,7 +221,7 @@ verifyTextPresent - This field must not be empty. + Please select a value in the Organization Type field. Please enter or select a value in the Name field. @@ -266,7 +266,7 @@ verifyTextPresent - This field must not be empty. + Please select a value in the Organization Type field. Please enter or select a value in the Name field. diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html index 7f1820c1..06cba124 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html @@ -386,7 +386,7 @@ verifyTextPresent - M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business 2002 - diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html index 6b313b83..0be3ec4d 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html @@ -101,7 +101,7 @@ verifyTextPresent - M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business 2002 - diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 666b3013..fd9b8437 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -131,7 +131,7 @@ verifyTextPresent - M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business 2002 - @@ -216,7 +216,7 @@ verifyTextNotPresent - M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business 2002 - diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html index 5c287616..55234412 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html @@ -191,7 +191,12 @@ verifyTextPresent - This field must not be empty. + Please enter a value in the Position Title field. + + + + verifyTextPresent + Please select a value in the Position Type field. @@ -210,13 +215,13 @@ - verifyTextPresent - This field must not be empty. + assertTitle + Edit - assertTitle - Edit + verifyTextPresent + Please select a value in the Position Type field. @@ -256,7 +261,7 @@ verifyTextPresent - Carroll College, Lecturer 1971 - + Lecturer, Carroll College 1971 - @@ -321,12 +326,12 @@ verifyTextPresent - Carroll College, Lecturer 1971 - + Lecturer, Carroll College 1971 - verifyTextPresent - Carroll University, Assistant Professor 1981 - 1985 + Assistant Professor, Carroll University 1981 - 1985 @@ -391,17 +396,17 @@ verifyTextPresent - Carroll College, Lecturer 1971 - + Lecturer, Carroll College 1971 - verifyTextPresent - Carroll University, Assistant Professor 1981 - 1985 + Assistant Professor, Cornell University 1986 - 2010 verifyTextPresent - Carroll University, Assistant Professor 1981 - 1985 + Assistant Professor, Carroll University 1981 - 1985 diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html index de1ce2bd..5ce813ca 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html @@ -126,17 +126,17 @@ verifyTextPresent - Carroll College, Lecturer 1971 - + Lecturer, Carroll College 1971 - verifyTextPresent - Carroll University, Assistant Professor 1981 - 1985 + Assistant Professor, Cornell University 1986 - 2010 verifyTextPresent - Carroll University, Assistant Professor 1981 - 1985 + Assistant Professor, Carroll University 1981 - 1985 @@ -206,17 +206,17 @@ verifyTextPresent - Carroll College, Lecturer 1977 - 1981 + Assistant Professor, Cornell University 1986 - 2010 verifyTextPresent - Carroll University, Assistant Professor 1981 - 1985 + Assistant Professor, Carroll University 1981 - 1985 verifyTextPresent - Carroll University, Assistant Professor 1981 - 1985 + Lecturer, Carroll College 1977 - 1981 @@ -281,17 +281,17 @@ verifyTextPresent - Carroll College, Lecturer 1977 - 1981 + Assistant Professor, Cornell University 1986 - 2010 verifyTextPresent - Carroll University, Associate Professor 1981 - 1985 + Associate Professor, Carroll University 1981 - 1985 verifyTextPresent - Cornell University, Assistant Professor 1986 - 2010 + Lecturer, Carroll College 1977 - 1981 @@ -361,17 +361,17 @@ verifyTextPresent - Carroll College, Lecturer 1977 - 1981 + Professor, Cornell University 1986 - verifyTextPresent - Carroll University, Associate Professor 1981 - 1985 + Associate Professor, Carroll University 1981 - 1985 verifyTextPresent - Cornell University, Professor 1986 - + Lecturer, Carroll College 1977 - 1981 diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html index b991fbe1..fe4682b5 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html @@ -96,17 +96,17 @@ verifyTextPresent - Cornell University, Professor 1986 - + Professor, Cornell University 1986 - verifyTextPresent - Carroll University, Associate Professor 1981 - 1985 + Associate Professor, Carroll University 1981 - 1985 verifyTextPresent - Carroll College, Lecturer 1977 - 1981 + Lecturer, Carroll College 1977 - 1981 diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html index 80796b5b..199cb343 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html @@ -186,12 +186,12 @@ clickAndWait - link=Person + link=Librarian assertTitle - Person + Librarian diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html index abc18ce1..89505cbf 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html @@ -119,11 +119,6 @@ Verify 3 user accounts exist before trying to delete them - - verifyTextPresent - 9 accounts - - verifyElementPresent link=EddieEditor@cornell.edu @@ -165,8 +160,28 @@ - verifyTextPresent - 8 accounts + click + name=deleteAccount + + + + click + name=delete-account + + + + assertConfirmation + Are you sure you want to delete this account? + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO @@ -196,37 +211,7 @@ verifyTextPresent - 7 accounts - - - - click - name=deleteAccount - - - - click - name=delete-account - - - - assertConfirmation - Are you sure you want to delete this account? - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO - - - - verifyTextPresent - 6 accounts + 5 accounts diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html index b06c59af..687239f2 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html @@ -739,11 +739,6 @@ Faculty, Jane - - verifyTextPresent - Faculty, Jane - - clickAndWait css=img.delete-individual diff --git a/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword.html b/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword.html index b40d7b3b..daf43fe6 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword.html +++ b/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword.html @@ -72,38 +72,23 @@ type loginPassword - myPassword + Password clickAndWait name=loginForm - - assertTitle - Log in to VIVO - - - - type - id=newPassword - Password - - - type - id=confirmPassword - Password - - - clickAndWait - name=passwordChangeForm - - assertTitle Faculty, Jane + + verifyTextPresent + Overview + + comment Confirm that it worked