diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html index e95056f9..52bebc2b 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -206,12 +211,12 @@ type - startField.year + startField-year 2009 type - endField.year + endField-year 2010 @@ -316,12 +321,12 @@ type - startField.year + startField-year 2007 type - endField.year + endField-year 2009 @@ -486,12 +491,12 @@ type - startField.year + startField-year 2009 type - endField.year + endField-year 2009 @@ -596,12 +601,12 @@ type - startField.year + startField-year 2010 type - endField.year + endField-year diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html index 1f8aaa59..280a68ab 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -286,12 +291,12 @@ type - startField.year + startField-year 2010 type - endField.year + endField-year @@ -406,12 +411,12 @@ type - startField.year + startField-year 1980 type - endField.year + endField-year 1985 @@ -521,12 +526,12 @@ type - startField.year + startField-year 2009 type - endField.year + endField-year 2009 @@ -636,12 +641,12 @@ type - startField.year + startField-year 2000 type - endField.year + endField-year 2001 @@ -751,12 +756,12 @@ type - startField.year + startField-year 2000 type - endField.year + endField-year 2005 @@ -876,12 +881,12 @@ type - startField.year + startField-year 1990 type - endField.year + endField-year 1991 @@ -1001,12 +1006,12 @@ type - startField.year + startField-year 1993 type - endField.year + endField-year diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html index 646d2ac9..eddb125d 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -346,7 +351,7 @@ type - startField.year + startField-year 2009 @@ -456,7 +461,7 @@ type - startField.year + startField-year 2003 @@ -591,12 +596,12 @@ type - startField.year + startField-year 2010 type - endField.year + endField-year @@ -706,12 +711,12 @@ type - startField.year + startField-year 2001 type - endField.year + endField-year 2003 @@ -846,12 +851,12 @@ type - startField.year + startField-year 2009 type - endField.year + endField-year @@ -961,12 +966,12 @@ type - startField.year + startField-year 2001 type - endField.year + endField-year 2001 diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html index 7396a4c3..48399ceb 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -181,12 +186,12 @@ type - startField.year + startField-year 2009 type - endField.year + endField-year @@ -296,12 +301,12 @@ type - startField.year + startField-year 1988 type - endField.year + endField-year diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html index 611e2d36..0ef88d75 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html index aea956bd..91ed8473 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -146,42 +151,27 @@ clickAndWait - link=Edit this individual + css=a.add-preferredTitle > img.add-individual assertTitle - Individual Control Panel + Edit - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - select - Moniker - label=[new moniker] - type - MonikerSelectAlt + tinymce Assistant Professor clickAndWait - primaryAction + submit assertTitle - Individual Control Panel + Faculty, Jane diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html b/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html index d1493ff8..a8d69d52 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html +++ b/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -146,42 +151,27 @@ clickAndWait - link=Edit this individual + css=a.add-preferredTitle > img.add-individual assertTitle - Individual Control Panel + Edit - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - select - Moniker - label=[new moniker] - type - MonikerSelectAlt + tinymce Associate Librarian clickAndWait - primaryAction + submit assertTitle - Individual Control Panel + Librarian, Lily diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html index 805f9f5f..0931320d 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html index 267d203d..203aaea6 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ diff --git a/utilities/acceptance-tests/suites/AddRoles/suite.html b/utilities/acceptance-tests/suites/AddRoles/suite.html index 6af4ff02..24423be4 100644 --- a/utilities/acceptance-tests/suites/AddRoles/suite.html +++ b/utilities/acceptance-tests/suites/AddRoles/suite.html @@ -1,26 +1,26 @@ - - - - - - Test Suite - - - - - - - - - - - - - - - - - -
Test Suite
CreateTestFacultyMember
CreateTestLibrarian
AddFacultyMemberRoles1
AddFacultyMemberRoles2
AddLibrarianRoles1
AddLibrarianRoles2
VerifyAllRolesSearchable
CheckPublicView
CheckIndexView
CheckRepairMode
DeleteTestFacultyMember
DeleteTestLibrarian
DeleteIndexStuff
- - + + + + + + Test Suite + + + + + + + + + + + + + + + + + +
Test Suite
CreateTestFacultyMember
CreateTestLibrarian
AddFacultyMemberRoles1
AddFacultyMemberRoles2
AddLibrarianRoles1
AddLibrarianRoles2
VerifyAllRolesSearchable
CheckPublicView
CheckIndexView
CheckRepairMode
DeleteTestFacultyMember
DeleteTestLibrarian
DeleteIndexStuff
+ + diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 254e6c97..82ef10ca 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -151,7 +151,7 @@ clickAndWait - //img[@alt='delete'] + css=a.delete-educationalTraining > img.delete-individual @@ -171,7 +171,7 @@ clickAndWait - //img[@alt='delete'] + css=a.delete-educationalTraining > img.delete-individual @@ -191,7 +191,7 @@ clickAndWait - //img[@alt='delete'] + css=a.delete-educationalTraining > img.delete-individual @@ -261,17 +261,7 @@ clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -280,20 +270,10 @@ - click + clickAndWait _delete - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - assertTitle VIVO Site Administration @@ -349,14 +329,9 @@ link=Edit this individual - - assertTitle - Individual Control Panel - - clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -441,7 +416,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html index beaf407d..a78ea3fd 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html @@ -124,14 +124,9 @@ Delete Jane Faculty - - assertTitle - Individual Control Panel - - clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -140,20 +135,10 @@ - click + clickAndWait _delete - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - assertTitle VIVO Site Administration diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html index 20ba999a..5c287616 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -226,12 +231,12 @@ type - startField.year + startField-year 1971 type - endField.year + endField-year @@ -291,12 +296,12 @@ type - startField.year + startField-year 1981 type - endField.year + endField-year 1985 @@ -361,12 +366,12 @@ type - startField.year + startField-year 1986 type - endField.year + endField-year 2010 diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html index 3b6e0043..de1ce2bd 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -151,12 +156,12 @@ type - startField.year + startField-year 1977 type - endField.year + endField-year 1981 @@ -311,7 +316,7 @@ type - endField.year + endField-year diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html index aea956bd..561a6ccd 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -145,57 +150,42 @@ - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel + assertTextPresent + Faculty Member clickAndWait - //input[@value='Edit This Individual'] + css=a.add-preferredTitle > img.add-individual assertTitle - Individual Editing Form + Edit - select - Moniker - label=[new moniker] + verifyTextPresent + Add new entry for: preferred title + type - MonikerSelectAlt + tinymce Assistant Professor clickAndWait - primaryAction + submit assertTitle - Individual Control Panel - - - - comment - Verify that account was created - - - - verifyTextPresent Faculty, Jane - verifyTextPresent + assertTextPresent Assistant Professor diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html index e8c7f7e6..dffdae20 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html @@ -35,13 +35,13 @@ - setTimeout - 200000 + deleteAllVisibleCookies + - deleteAllVisibleCookies - + setTimeout + 200000 @@ -126,7 +126,7 @@ clickAndWait - //img[@alt='delete'] + css=a.delete-personInPosition > img.delete-individual @@ -146,7 +146,7 @@ clickAndWait - //img[@alt='delete'] + css=a.delete-personInPosition > img.delete-individual @@ -166,7 +166,7 @@ clickAndWait - //img[@alt='delete'] + css=a.delete-personInPosition > img.delete-individual @@ -226,7 +226,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -284,14 +284,9 @@ link=Edit this individual - - assertTitle - Individual Control Panel - - clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -349,14 +344,9 @@ link=Edit this individual - - assertTitle - Individual Control Panel - - clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html index c6136c89..186ede13 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html @@ -124,14 +124,9 @@ Delete Jane Faculty - - assertTitle - Individual Control Panel - - clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -140,7 +135,7 @@ - click + clickAndWait _delete diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html index ff78dbd0..2824e6aa 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html @@ -89,6 +89,11 @@ link=Carroll College + + verifyTextPresent + College + + verifyElementPresent link=Faculty, Jane @@ -96,7 +101,7 @@ verifyTextPresent - Faculty, Jane | Assistant Professor + Assistant Professor @@ -141,7 +146,7 @@ verifyTextPresent - Faculty, Jane | Assistant Professor + Assistant Professor @@ -149,11 +154,21 @@ link=Carroll University + + verifyTextPresent + University + + verifyElementPresent link=Cornell University + + verifyTextPresent + University + + comment Search for Carroll, which should bring up 2 organizations @@ -179,6 +194,11 @@ Search results for 'carroll' + + verifyElementPresent + link=people + + verifyElementPresent link=organizations @@ -189,11 +209,31 @@ link=Carroll College + + verifyTextPresent + College + + verifyElementPresent link=Carroll University + + verifyTextPresent + University + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Assistant Professor + + comment Link to Carroll College to verify Jane Faculty is listed @@ -264,11 +304,21 @@ link=Cornell University + + verifyTextPresent + University + + verifyElementPresent link=Carroll University + + verifyTextPresent + University + + comment Make sure Jane Faculty is associated with Carroll and Cornell @@ -284,16 +334,6 @@ Carroll University - - verifyTextPresent - Affiliation - - - - verifyTextPresent - people - - verifyElementNotPresent link=Faculty, Jane