diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html index 4de17a85..78a8c560 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html @@ -134,6 +134,11 @@ Edit + + verifyTextPresent + Create a new position entry for Jane Faculty + + verifyTextPresent If your organization is not listed, please add a new organization. @@ -145,15 +150,10 @@ - click + clickAndWait link=Cancel - - pause - 50000 - - clickAndWait //div[@id='personInPosition']/a @@ -255,15 +255,10 @@ Lecturer - click + clickAndWait submit - - pause - 50000 - - verifyTextPresent This field must not be empty. @@ -325,15 +320,10 @@ 9999 - click + clickAndWait submit - - pause - 50000 - - comment Verify first position is listed properly @@ -390,15 +380,10 @@ 1985 - click + clickAndWait submit - - pause - 50000 - - assertTitle Jane Faculty @@ -470,15 +455,10 @@ 2010 - click + clickAndWait submit - - pause - 50000 - - assertTitle Jane Faculty diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html index ded723fb..3e755418 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html @@ -151,7 +151,7 @@ clickAndWait - //div[@id='personInPosition']/ul/li[1]/span/span/a[1] + //div[@id='personInPosition']/ul/li[3]/span/span/a[1] @@ -174,6 +174,31 @@ submit + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + comment Verify positions are still listed correctly @@ -201,12 +226,17 @@ comment - Change the or organization for one position + Change the organization for 1981-1985 Carroll College position clickAndWait - //div[@id='personInPosition']/ul/li[2]/span/span/a[1] + //div[@id='personInPosition']/ul/li[1]/span/span/a[1] + + + + assertTitle + Edit @@ -235,8 +265,28 @@ - assertTitle - Jane Faculty + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 @@ -244,6 +294,11 @@ Verify positions are still listed correctly + + assertTitle + Jane Faculty + + verifyTextPresent Cornell University Assistant Professor, 1986 - 2010 @@ -266,7 +321,7 @@ clickAndWait - //div[@id='personInPosition']/ul/li[3]/span/span/a[1] + //div[@id='personInPosition']/ul/li[2]/span/span/a[1] @@ -274,56 +329,6 @@ Edit - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - select organizationUri @@ -345,13 +350,28 @@ - pause - 50000 + refreshAndWait + 10000 - assertTitle - Jane Faculty + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 @@ -359,6 +379,11 @@ Verify positions are still listed correctly + + assertTitle + Jane Faculty + + verifyTextPresent Carroll University Professor, 1986 - diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckIndexView.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckIndexView.html index 4dd9555a..361985b1 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckIndexView.html @@ -69,6 +69,36 @@ Verify all 3 organization entries appear properly + + verifyElementPresent + link=College + + + + verifyTextPresent + College (1) + + + + verifyElementPresent + link=Organization + + + + verifyTextPresent + Organization (3) + + + + verifyElementPresent + link=University + + + + verifyTextPresent + University (2) + + comment Go back to the beginning diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html index b8d2690b..ccdb159f 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html @@ -94,6 +94,26 @@ Verify all 3 positions appear properly + + verifyTextPresent + positions + + + + verifyTextPresent + Carroll University Assistant Professor, 1981 - 1985 + + + + verifyTextPresent + Carroll College Lecturer, 1977 - 1981 + + + + verifyTextPresent + Carroll University Professor, 1986 - + + comment Go back to the beginning diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html index a207c0d7..65ba26fe 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html @@ -109,11 +109,6 @@ //input[@value='Add individual of this class'] - - pause - 50000 - - assertTitle Individual Editing Form @@ -144,11 +139,6 @@ primaryAction - - pause - 50000 - - assertTitle Individual Control Panel diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html index acf60d71..02b366b5 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html @@ -55,15 +55,10 @@ - click + clickAndWait link=Log in - - pause - 50000 - - assertTitle VIVO Site Administration @@ -100,45 +95,30 @@ - click + clickAndWait link=Index - - pause - 50000 - - assertTitle Index to VIVO Contents - click + clickAndWait link=Faculty Member - - pause - 50000 - - assertTitle Faculty Member - click + clickAndWait link=Jane Faculty - - pause - 50000 - - assertTitle Jane Faculty @@ -150,105 +130,70 @@ - click + clickAndWait link=delete - - pause - 50000 - - assertTitle Edit - click + clickAndWait submit - - pause - 50000 - - assertTitle Jane Faculty - click + clickAndWait link=delete - - pause - 50000 - - assertTitle Edit - click + clickAndWait submit - - pause - 50000 - - assertTitle Jane Faculty - click + clickAndWait link=delete - - pause - 50000 - - assertTitle Edit - click + clickAndWait submit - - pause - 50000 - - assertTitle Jane Faculty - click + clickAndWait link=Index - - pause - 50000 - - assertTitle Index to VIVO Contents @@ -260,60 +205,40 @@ - click + clickAndWait link=College - - waitForPageToLoad - 50000 - - assertTitle College - click + clickAndWait link=Carroll College - - waitForPageToLoad - 50000 - - assertTitle Carroll College - click + clickAndWait link=edit this individual - - pause - 50000 - - assertTitle Individual Control Panel - click + clickAndWait //input[@value='Edit This Individual'] - - pause - 50000 - - assertTitle Individual Editing Form @@ -340,75 +265,50 @@ - click + clickAndWait link=Index - - pause - 50000 - - assertTitle Index to VIVO Contents - click + clickAndWait link=Organization - - pause - 50000 - - assertTitle Organization - click + clickAndWait link=Carroll University - - pause - 50000 - - assertTitle Carroll University - click + clickAndWait link=edit this individual - - pause - 50000 - - assertTitle Individual Control Panel - click + clickAndWait //input[@value='Edit This Individual'] - - pause - 50000 - - assertTitle Individual Editing Form @@ -435,75 +335,50 @@ - click + clickAndWait link=Index - - pause - 50000 - - assertTitle Index to VIVO Contents - click + clickAndWait link=Organization - - pause - 50000 - - assertTitle Organization - click + clickAndWait link=Cornell University - - pause - 50000 - - assertTitle Cornell University - click + clickAndWait link=edit this individual - - pause - 50000 - - assertTitle Individual Control Panel - click + clickAndWait //input[@value='Edit This Individual'] - - pause - 50000 - - assertTitle Individual Editing Form @@ -530,15 +405,10 @@ - click + clickAndWait link=Index - - pause - 50000 - - assertTitle Index to VIVO Contents diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html index c65c6acf..9c5a408a 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html @@ -100,15 +100,10 @@ professor - click + clickAndWait submit - - pause - 10000 - - assertTitle professor - VIVO Search Results @@ -135,15 +130,10 @@ carroll - click + clickAndWait submit - - pause - 10000 - - assertTitle carroll - VIVO Search Results @@ -170,15 +160,10 @@ carroll college - click + clickAndWait submit - - pause - 10000 - - assertTitle carroll college - VIVO Search Results @@ -190,15 +175,10 @@ - click + clickAndWait link=Carroll College - - pause - 10000 - - assertTitle Carroll College @@ -220,15 +200,10 @@ carroll university - click + clickAndWait submit - - pause - 10000 - - assertTitle carroll university - VIVO Search Results @@ -240,15 +215,10 @@ - click + clickAndWait link=Carroll University - - pause - 50000 - - assertTitle Carroll University @@ -259,11 +229,6 @@ link=Jane Faculty - - pause - 50000 - - verifyTextPresent Jane Faculty Professor, 1986 - @@ -284,11 +249,6 @@ submit - - pause - 50000 - - assertTitle university - VIVO Search Results @@ -310,15 +270,10 @@ - click + clickAndWait link=Cornell University - - pause - 50000 - - assertTitle Cornell University @@ -329,11 +284,6 @@ link=Jane Faculty - - pause - 50000 - - comment Go to home page