diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html index 6774d640..16e92b19 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html @@ -236,9 +236,34 @@ type - startYear + startField.year 1971 + + select + startField.month + label=month + + + select + startField.day + label=day + + + type + endField.year + + + + select + endField.month + label=month + + + select + endField.day + label=day + clickAndWait submit @@ -277,17 +302,12 @@ select typeSelector - label=College + label=University type relatedIndLabel - Carroll College - - - click - ui-active-menuitem - + Carroll University type @@ -301,14 +321,34 @@ type - startYear + startField.year 1981 + + select + startField.month + label=month + + + select + startField.day + label=day + type - endYear + endField.year 1985 + + select + endField.month + label=month + + + select + endField.day + label=day + clickAndWait submit @@ -331,7 +371,7 @@ verifyTextPresent - Carroll College Assistant Professor, 1981 - 1985 + Carroll University Assistant Professor, 1981 - 1985 @@ -371,14 +411,34 @@ type - startYear + startField.year 1986 + + select + startField.month + label=month + + + select + startField.day + label=day + type - endYear + endField.year 2010 + + select + endField.month + label=month + + + select + endField.day + label=day + clickAndWait submit @@ -406,7 +466,7 @@ verifyTextPresent - Carroll College Assistant Professor, 1981 - 1985 + Carroll University Assistant Professor, 1981 - 1985 diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html index 61061d73..f8f743ad 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html @@ -136,7 +136,7 @@ verifyTextPresent - Carroll College Assistant Professor, 1981 - 1985 + Carroll University Assistant Professor, 1981 - 1985 @@ -146,7 +146,7 @@ comment - Correct the dates of the lecturer position + Correct the dates of the Carroll College @@ -161,12 +161,12 @@ type - startYear + startField.year 1977 type - endYear + endField.year 1981 @@ -216,7 +216,7 @@ verifyTextPresent - Carroll College Assistant Professor, 1981 - 1985 + Carroll University Assistant Professor, 1981 - 1985 @@ -226,7 +226,7 @@ comment - Change the organization for 1981-1985 Carroll College position + Change the title for Carroll University position @@ -241,13 +241,8 @@ type - newOrgName - Carroll University - - - select - newOrgType - label=University + positionTitle + Associate Professor clickAndWait @@ -296,7 +291,7 @@ verifyTextPresent - Carroll University Assistant Professor, 1981 - 1985 + Carroll University Associate Professor, 1981 - 1985 @@ -306,7 +301,7 @@ comment - Change Cornell University position to Carroll University + Change the title for Cornell University position @@ -319,19 +314,14 @@ Edit - - select - organizationUri - label=Carroll University - type - title + positionTitle Professor type - endYear + endField.year @@ -376,12 +366,12 @@ verifyTextPresent - Carroll University Professor, 1986 - + Cornell University Professor, 1986 - verifyTextPresent - Carroll University Assistant Professor, 1981 - 1985 + Carroll University Associate Professor, 1981 - 1985 diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html index 9dfd5e26..d72cd6eb 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html @@ -101,7 +101,7 @@ verifyTextPresent - Carroll University Assistant Professor, 1981 - 1985 + Carroll University Associate Professor, 1981 - 1985 @@ -111,7 +111,7 @@ verifyTextPresent - Carroll University Professor, 1986 - + Cornell University Professor, 1986 - diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html index 6b78bf8f..3be2e297 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html @@ -71,7 +71,7 @@ verifyTextPresent - Search Results for 'lecturer' + Search results for 'lecturer' @@ -111,7 +111,7 @@ verifyTextPresent - ... positions Professor positions Lecturer positions Assistant Professor ... + ... positions Lecturer positions Associate Professor positions Professor ... @@ -136,7 +136,7 @@ verifyTextPresent - Search Results for 'professor' + Search results for 'professor' @@ -161,7 +161,7 @@ verifyTextPresent - ... positions Professor positions Lecturer positions Assistant Professor ... + ... positions Lecturer positions Associate Professor positions Professor ... @@ -176,7 +176,17 @@ verifyTextPresent - ... people Professor people Assistant Professor ... + ... people Associate Professor ... + + + + verifyElementPresent + link=Cornell University + + + + verifyTextPresent + ... people Professor ... @@ -201,7 +211,7 @@ verifyTextPresent - Search Results for 'carroll' + Search results for 'carroll' @@ -231,7 +241,7 @@ comment - Link to Carroll College to verify Jane Faculty is no longer listed + Link to Carroll College to verify Jane Faculty is listed @@ -244,49 +254,19 @@ Carroll College - - type - querytext - carroll - - - clickAndWait - //input[@value='Search'] - - - - assertTitle - carroll - VIVO Search Results - - - - comment - Link to Carroll University to verify Jane Faculty is listed - - - - clickAndWait - link=Carroll University - - - - assertTitle - Carroll University - - verifyTextPresent - Faculty Position + Faculty Administrative Position - assertElementPresent + verifyElementPresent link=Faculty, Jane verifyTextPresent - Faculty, Jane Professor, 1986 - + Faculty, Jane Lecturer, 1977 - 1981 @@ -311,7 +291,7 @@ verifyTextPresent - Search Results for 'university' + Search results for 'university' @@ -341,7 +321,42 @@ comment - Make sure Jane Faculty is no longer associated with Cornell + Make sure Jane Faculty is associated with Carroll and Cornell + + + + clickAndWait + link=Carroll University + + + + assertTitle + Carroll University + + + + verifyTextPresent + Faculty Position + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Faculty, Jane Associate Professor, , 1981 - 1985 + + + + type + querytext + university + + + clickAndWait + //input[@value='Search'] @@ -355,10 +370,20 @@ - verifyElementNotPresent + verifyTextPresent + Faculty Position + + + + verifyElementPresent link=Faculty, Jane + + verifyTextPresent + Faculty, Jane Associate Professor, 1986 + + comment Go to home page