diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html index cb5003bf..6c5f15e8 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html @@ -131,12 +131,7 @@ assertTitle - VIVO - - - - - + Edit @@ -149,14 +144,9 @@ link=Cancel - - clickAndWait - //section[@id='individual-info']/header/h2/a/img - - assertTitle - Edit + Faculty, Jane @@ -165,18 +155,23 @@ - select - typeSelector - label=College + clickAndWait + css=a.add-awardOrHonor > img.add-individual + + + + assertTitle + Edit + type - id=orgLabel + id=org Carroll College clickAndWait - submit + css=input.submit @@ -186,127 +181,37 @@ verifyTextPresent - Please enter a value in the Position Title field. - - - - verifyTextPresent - Please select a value in the Position Type field. + Please select an existing value or enter a new value in the Award or Honor Name field. comment - Add position title, but leave position type and start year blank + Add rest of info type - positionTitle - Lecturer + id=award + Best Professor + + + type + id=org + Carroll College + + + type + id=description + Yearly award for the best professor across departments. + + + type + id=yearAwardedDisplay + 2012 clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Please select a value in the Position Type field. - - - - comment - Enter in all fields except for end year - - - - select - positionType - label=Faculty Administrative Position - - - type - startField-year - 1971 - - - type - endField-year - - - - clickAndWait - submit - - - - comment - Verify first position is listed properly - - - - assertTitle - Faculty, Jane - - - - verifyTextPresent - Lecturer, Carroll College 1971 - - - - - comment - Add second position using same organization - - - - clickAndWait - //section[@id='individual-info']/header/h2/a/img - - - - assertTitle - Edit - - - - select - typeSelector - label=University - - - type - id=orgLabel - Carroll University - - - type - positionTitle - Assistant Professor - - - select - positionType - label=Faculty Position - - - type - startField-year - 1981 - - - type - endField-year - 1985 - - - clickAndWait - submit + css=input.submit @@ -316,27 +221,32 @@ comment - Verify both positions are listed properly + Verify first award is listed properly verifyTextPresent - Lecturer, Carroll College 1971 - + Best Professor, conferred by Carroll College, 2012 - verifyTextPresent - Assistant Professor, Carroll University 1981 - 1985 + verifyElementPresent + link=Best Professor + + + + verifyElementPresent + link=Carroll College comment - Add third position using new organization + Add second award using same organization clickAndWait - //section[@id='individual-info']/header/h2/a/img + css=a.add-awardOrHonor > img.add-individual @@ -345,38 +255,118 @@ - select - typeSelector - label=University + type + id=award + Professor of the Decade type - id=orgLabel - Cornell University + id=org + Car + + + click + id=ui-active-menuitem + type - positionTitle - Assistant Professor - - - select - positionType - label=Faculty Position + id=yearAwardedDisplay + 2010 type - startField-year - 1986 + id=startField-year + 2000 type - endField-year + id=endField-year 2010 clickAndWait - submit + css=input.submit + + + + assertTitle + Faculty, Jane + + + + comment + Verify both awards are listed properly + + + + verifyTextPresent + Best Professor, conferred by Carroll College, 2012 + + + + verifyElementPresent + link=Best Professor + + + + verifyElementPresent + link=Carroll College + + + + verifyTextPresent + Professor of the Decade, conferred by Carroll College, 2010 + + + + verifyElementPresent + link=Professor of the Decade + + + + verifyElementPresent + link=Carroll College + + + + comment + Add third award using new organization + + + + clickAndWait + css=a.add-awardOrHonor > img.add-individual + + + + assertTitle + Edit + + + + type + id=award + Primate Expert + + + type + id=org + Primates-R-Us + + + type + id=description + Yearly award for the person who does the most to improve the life of primates. + + + type + id=yearAwardedDisplay + 2005 + + + clickAndWait + css=input.submit @@ -391,17 +381,312 @@ verifyTextPresent - Lecturer, Carroll College 1971 - + Best Professor, conferred by Carroll College, 2012 + + + + verifyElementPresent + link=Best Professor + + + + verifyElementPresent + link=Carroll College verifyTextPresent - Assistant Professor, Cornell University 1986 - 2010 + Professor of the Decade, conferred by Carroll College, 2010 + + + + verifyElementPresent + link=Professor of the Decade + + + + verifyElementPresent + link=Carroll College verifyTextPresent - Assistant Professor, Carroll University 1981 - 1985 + Primate Expert, conferred by Primates-R-Us, 2005 + + + + verifyElementPresent + link=Primate Expert + + + + verifyElementPresent + link=Primates-R-Us + + + + comment + Verify deeper + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + + + clickAndWait + link=Best Professor + + + + assertTitle + Best Professor + + + + verifyElementPresent + link=Carroll College + + + + verifyElementPresent + link=Best Professor (Faculty, Jane - 2012) + + + + clickAndWait + link=Best Professor (Faculty, Jane - 2012) + + + + assertTitle + Best Professor (Faculty, Jane - 2012) + + + + verifyElementPresent + link=Best Professor + + + + verifyTextPresent + Faculty, Jane Assistant Professor + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Yearly award for the best professor across departments. + + + + verifyTextPresent + 2012 + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + + + clickAndWait + link=Professor of the Decade + + + + assertTitle + Professor of the Decade + + + + verifyElementPresent + link=Carroll College + + + + verifyElementPresent + link=Professor of the Decade (Faculty, Jane - 2010) + + + + clickAndWait + link=Professor of the Decade (Faculty, Jane - 2010) + + + + assertTitle + Professor of the Decade (Faculty, Jane - 2010) + + + + verifyTextPresent + Professor of the Decade + + + + verifyTextPresent + Faculty, Jane Assistant Professor + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + 2000 - 2010 + + + + verifyTextPresent + 2010 + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + + + clickAndWait + link=Primate Expert + + + + assertTitle + Primate Expert + + + + verifyElementPresent + link=Primates-R-Us + + + + verifyElementPresent + link=Primate Expert (Faculty, Jane - 2005) + + + + clickAndWait + link=Primate Expert (Faculty, Jane - 2005) + + + + assertTitle + Primate Expert (Faculty, Jane - 2005) + + + + verifyElementPresent + link=Primate Expert + + + + assertTitle + Primate Expert (Faculty, Jane - 2005) + + + + verifyTextPresent + Faculty, Jane Assistant Professor + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Yearly award for the person who does the most to improve the life of primates. + + + + verifyTextPresent + 2005 diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html index 5ce813ca..fe1fe946 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html @@ -31,7 +31,7 @@ comment - Change 3 existing positions + Change 3 existing awards @@ -126,27 +126,57 @@ verifyTextPresent - Lecturer, Carroll College 1971 - + Best Professor, conferred by Carroll College, 2012 + + + + verifyElementPresent + link=Best Professor + + + + verifyElementPresent + link=Carroll College verifyTextPresent - Assistant Professor, Cornell University 1986 - 2010 + Professor of the Decade, conferred by Carroll College, 2010 + + + + verifyElementPresent + link=Professor of the Decade + + + + verifyElementPresent + link=Carroll College verifyTextPresent - Assistant Professor, Carroll University 1981 - 1985 + Primate Expert, conferred by Primates-R-Us, 2005 + + + + verifyElementPresent + link=Primate Expert + + + + verifyElementPresent + link=Primates-R-Us comment - Correct the dates of the Carroll College position + Correct the date of the Best Professor award clickAndWait - //section[@id='individual-info']/header/ul/li[1]/a[2]/img + css=a.edit-awardOrHonor > img.edit-individual @@ -156,47 +186,12 @@ type - startField-year - 1977 - - - type - endField-year - 1981 + id=yearAwardedDisplay + 2002 clickAndWait - submit - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - comment - Verify positions are still listed correctly + css=input.submit @@ -205,28 +200,63 @@ - verifyTextPresent - Assistant Professor, Cornell University 1986 - 2010 + comment + Verify awards are still listed correctly verifyTextPresent - Assistant Professor, Carroll University 1981 - 1985 + Best Professor, conferred by Carroll College, 2002 + + + + verifyElementPresent + link=Best Professor + + + + verifyElementPresent + link=Carroll College verifyTextPresent - Lecturer, Carroll College 1977 - 1981 + Professor of the Decade, conferred by Carroll College, 2010 + + + + verifyElementPresent + link=Professor of the Decade + + + + verifyElementPresent + link=Carroll College + + + + verifyTextPresent + Primate Expert, conferred by Primates-R-Us, 2005 + + + + verifyElementPresent + link=Primate Expert + + + + verifyElementPresent + link=Primates-R-Us comment - Change the title for Carroll University position + Remove year but add year range to Primate Expert award clickAndWait - //section[@id='individual-info']/header/ul/li[2]/a[2]/img + xpath=(//img[@alt='edit'])[4] @@ -236,37 +266,102 @@ type - positionTitle - Associate Professor + id=yearAwardedDisplay + + + + type + id=startField-year + 2004 + + + type + id=endField-year + 2005 clickAndWait - submit + css=input.submit - refreshAndWait - 10000 + assertTitle + VIVO - refreshAndWait - 10000 + assertTitle + Edit - refreshAndWait - 10000 + clickAndWait + css=input.submit - refreshAndWait - 10000 + assertTitle + VIVO - refreshAndWait - 10000 + assertTitle + Edit + + + + clickAndWait + link=Cancel + + + + assertTitle + Faculty, Jane + + + + clickAndWait + xpath=(//img[@alt='edit'])[4] + + + + assertTitle + Edit + + + + type + id=yearAwardedDisplay + + + + type + id=startField-year + 2004 + + + type + id=endField-year + 2005 + + + clickAndWait + css=input.submit + + + + assertTitle + VIVO + + + + assertTitle + Edit + + + + +