diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html index 384354fb..5e4d0380 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='hasCo-PrincipalInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[4]/h3/a/img @@ -181,7 +181,7 @@ clickAndWait - //div[@id='hasCo-PrincipalInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[4]/h3/a/img @@ -339,11 +339,6 @@ 2009 - 2010 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li/span - - comment Add second Co-principal Investigator role @@ -351,7 +346,7 @@ clickAndWait - //div[@id='hasCo-PrincipalInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[4]/h3/a/img @@ -459,11 +454,6 @@ 2007 - 2009 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li[1]/span - - verifyElementPresent link=NIH VIVO @@ -474,11 +464,6 @@ 2009 - 2010 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li[2]/span - - comment Cancel out before adding Investigator @@ -486,7 +471,7 @@ clickAndWait - //div[@id='hasInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[5]/h3/a/img @@ -536,7 +521,7 @@ clickAndWait - //div[@id='hasInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[5]/h3/a/img @@ -694,11 +679,6 @@ 2009 - - verifyElementPresent - //div[@id='hasInvestigatorRole']/ul/li/span/a - - comment Add Principal Investigator role @@ -706,7 +686,7 @@ clickAndWait - //div[@id='hasPrincipalInvestigatorRole']/a + //div[@id='wrapper-content']/section[5]/article[3]/h3/a/img @@ -809,11 +789,6 @@ 2010 - - verifyElementPresent - //div[@id='hasPrincipalInvestigatorRole']/ul/li/span - - comment Verify that all grant roles are still there @@ -829,11 +804,6 @@ 2009 - 2010 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li/span - - verifyTextPresent VIVO Cornell Grant @@ -844,11 +814,6 @@ 2007 - 2009 - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li[2]/span - - verifyTextPresent VIVO Cornell Grant Too @@ -859,11 +824,6 @@ 2009 - - verifyElementPresent - //div[@id='hasInvestigatorRole']/ul/li/span - - verifyTextPresent NIH VIVO Too @@ -874,11 +834,6 @@ 2010 - - verifyElementPresent - //div[@id='hasPrincipalInvestigatorRole']/ul/li/span - - comment Log out diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html index eceb5c50..805c3c73 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='hasResearcherRole']/a + //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img @@ -161,7 +161,7 @@ clickAndWait - //div[@id='hasResearcherRole']/a + //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img @@ -289,36 +289,6 @@ roleLabel Consultant - - type - startField.year - - - - type - endField.year - - - - clickAndWait - submit - - - - verifyTextPresent - This field must not be empty. - - - - type - relatedIndLabel - History of Apes in Africa - - - type - roleLabel - Consultant - type startField.year @@ -376,7 +346,7 @@ clickAndWait - //div[@id='hasResearcherRole']/a + //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img @@ -506,7 +476,7 @@ clickAndWait - //div[@id='hasTeacherRole']/a + //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img @@ -626,7 +596,7 @@ clickAndWait - //div[@id='hasTeacherRole']/a + //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img @@ -746,7 +716,7 @@ clickAndWait - //div[@id='hasTeacherRole']/a + //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img @@ -866,7 +836,7 @@ clickAndWait - //div[@id='hasClinicalRole']/a + //div[@id='wrapper-content']/section[3]/article[5]/h3/a/img @@ -996,7 +966,7 @@ clickAndWait - //div[@id='hasClinicalRole']/a + //div[@id='wrapper-content']/section[3]/article[5]/h3/a/img @@ -1124,11 +1094,6 @@ Verify activities displayed for Jane Faculty - - verifyElementPresent - link=Prototype New Ape Home - - verifyTextPresent Designer 1990 - 1991 diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html index 4cb40e1b..fd3b3c09 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='hasPresenterRole']/a + //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img @@ -166,7 +166,7 @@ clickAndWait - //div[@id='hasPresenterRole']/a + //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img @@ -314,71 +314,6 @@ This field must not be empty. - - comment - Start to add presentation again, but enter only first 2 required fields - - - - verifyTextPresent - Create presentation entry for Librarian, Lily - - - - verifyTextPresent - Presentation Type - - - - verifyTextPresent - Presentation Name - - - - verifyTextPresent - Role in Presentation - - - - verifyTextPresent - Year - - - - type - relatedIndLabel - Researching Primates - - - type - roleLabel - Presenter - - - type - startField.year - - - - type - endField.year - - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - This field must not be empty. - - comment Add presentation correctly @@ -476,7 +411,7 @@ clickAndWait - //div[@id='hasPresenterRole']/a + //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img @@ -599,11 +534,6 @@ Member of panel 2003 - - verifyElementPresent - //div[@id='hasPresenterRole']/ul/li[1]/span - - verifyElementPresent link=Researching Primates @@ -614,11 +544,6 @@ Presenter 2009 - - verifyElementPresent - //div[@id='hasPresenterRole']/ul/li/span - - comment Add service to the profession - college @@ -626,7 +551,7 @@ clickAndWait - //div[@id='hasServiceProviderRole']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -746,7 +671,7 @@ clickAndWait - //div[@id='hasServiceProviderRole']/a + //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img @@ -874,11 +799,6 @@ Board 2001 - 2003 - - verifyElementPresent - //div[@id='hasServiceProviderRole']/ul/li[1]/span - - verifyTextPresent Carroll College @@ -889,11 +809,6 @@ Consultant 2010 - - - verifyElementPresent - //div[@id='hasServiceProviderRole']/ul/li[2]/span - - comment Add outreach and community service - committee @@ -901,7 +816,7 @@ clickAndWait - //div[@id='hasOutreachProviderRole']/a + //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img @@ -1021,7 +936,7 @@ clickAndWait - //div[@id='hasOutreachProviderRole']/a + //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img @@ -1149,11 +1064,6 @@ Booth 2001 - - verifyElementPresent - //div[@id='hasOutreachProviderRole']/ul/li[1]/span - - verifyElementPresent link=Librarians for the Better Treatment of Primates @@ -1164,11 +1074,6 @@ Chair 2009 - - - verifyElementPresent - //div[@id='hasOutreachProviderRole']/ul/li[2]/span - - comment Log out diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html index 99d96a9a..b16d38d0 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='hasLeaderRole']/a + //div[@id='wrapper-content']/section[3]/article[2]/h3/a/img @@ -251,7 +251,7 @@ clickAndWait - //div[@id='hasMemberRole']/a + //div[@id='wrapper-content']/section[3]/article[3]/h3/a/img @@ -379,11 +379,6 @@ Head Librarian 2009 - - - verifyElementPresent - //div[@id='hasLeaderRole']/ul/li/span - - verifyElementPresent link=Amercian Library Association @@ -394,11 +389,6 @@ Member 1988 - - - verifyElementPresent - //div[@id='hasMemberRole']/ul/li/span - - comment Log out diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html index 768f26ea..a4177229 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html @@ -186,12 +186,17 @@ verifyTextPresent - Museum (1) + Department (1) verifyTextPresent - Organization (5) + Group (1) + + + + verifyTextPresent + Organization (4) @@ -279,6 +284,11 @@ link=Department + + verifyElementPresent + link=Group + + verifyElementPresent link=Museum @@ -304,7 +314,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html index 8d3cc900..54c5efc5 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='personInPosition']/a + //section[@id='individual-info']/header/h2/a/img @@ -161,7 +161,7 @@ clickAndWait - //div[@id='personInPosition']/a + //section[@id='individual-info']/header/h2/a/img @@ -261,7 +261,7 @@ verifyTextPresent - Carroll College Lecturer, 1971 - + Carroll College, Lecturer 1971 - @@ -271,7 +271,7 @@ clickAndWait - //div[@id='personInPosition']/a + //section[@id='individual-info']/header/h2/a/img @@ -326,12 +326,12 @@ verifyTextPresent - Carroll College Lecturer, 1971 - + Carroll College, Lecturer 1971 - verifyTextPresent - Carroll University Assistant Professor, 1981 - 1985 + Carroll University, Assistant Professor 1981 - 1985 @@ -341,7 +341,7 @@ clickAndWait - //div[@id='personInPosition']/a + //section[@id='individual-info']/header/h2/a/img @@ -396,17 +396,17 @@ verifyTextPresent - Carroll College Lecturer, 1971 - + Carroll College, Lecturer 1971 - verifyTextPresent - Cornell University Assistant Professor, 1986 - 2010 + Carroll University, Assistant Professor 1981 - 1985 verifyTextPresent - Carroll University 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 f8f743ad..6771fb98 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html @@ -131,27 +131,27 @@ verifyTextPresent - Cornell University Assistant Professor, 1986 - 2010 + Carroll College, Lecturer 1971 - verifyTextPresent - Carroll University Assistant Professor, 1981 - 1985 + Carroll University, Assistant Professor 1981 - 1985 verifyTextPresent - Carroll College Lecturer, 1971 - + Carroll University, Assistant Professor 1981 - 1985 comment - Correct the dates of the Carroll College + Correct the dates of the Carroll College position clickAndWait - //div[@id='personInPosition']/ul/li[1]/span/span/a[1] + //ul[@id='individual-positions']/li[1]/a[2]/img @@ -211,17 +211,17 @@ verifyTextPresent - Cornell University Assistant Professor, 1986 - 2010 + Carroll College, Lecturer 1977 - 1981 verifyTextPresent - Carroll University Assistant Professor, 1981 - 1985 + Carroll University, Assistant Professor 1981 - 1985 verifyTextPresent - Carroll College Lecturer, 1977 - 1981 + Carroll University, Assistant Professor 1981 - 1985 @@ -231,7 +231,7 @@ clickAndWait - //div[@id='personInPosition']/ul/li[2]/span/span/a[1] + //ul[@id='individual-positions']/li[2]/a[2]/img @@ -286,17 +286,17 @@ verifyTextPresent - Cornell University Assistant Professor, 1986 - 2010 + Carroll College, Lecturer 1977 - 1981 verifyTextPresent - Carroll University Associate Professor, 1981 - 1985 + Carroll University, Associate Professor 1981 - 1985 verifyTextPresent - Carroll College Lecturer, 1977 - 1981 + Cornell University, Assistant Professor 1986 - 2010 @@ -306,7 +306,7 @@ clickAndWait - //div[@id='personInPosition']/ul/li[1]/span/span/a[1] + //ul[@id='individual-positions']/li[1]/a[2]/img @@ -366,17 +366,17 @@ verifyTextPresent - Cornell University Professor, 1986 - + Carroll College, Lecturer 1977 - 1981 verifyTextPresent - Carroll University Associate Professor, 1981 - 1985 + Carroll University, Associate Professor 1981 - 1985 verifyTextPresent - Carroll College Lecturer, 1977 - 1981 + Cornell University, Professor 1986 - diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html index d72cd6eb..052a7885 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html @@ -96,22 +96,22 @@ verifyTextPresent - positions + Positions verifyTextPresent - Carroll University Associate Professor, 1981 - 1985 + Cornell University, Professor 1986 - verifyTextPresent - Carroll College Lecturer, 1977 - 1981 + Carroll University, Associate Professor 1981 - 1985 verifyTextPresent - Cornell University Professor, 1986 - + Carroll College, Lecturer 1977 - 1981 diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html index 8f62edde..c2931a7f 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html @@ -131,7 +131,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -151,7 +151,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -171,7 +171,7 @@ clickAndWait - link=delete + //img[@alt='delete'] @@ -189,6 +189,11 @@ Faculty, Jane + + comment + Delete organizations one at a time + + clickAndWait link=Index @@ -199,11 +204,6 @@ Index to VIVO Contents - - comment - Delete organizations one at a time - - clickAndWait link=College diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html index 3be2e297..3654a425 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html @@ -94,11 +94,6 @@ Carroll College | College - - verifyTextPresent - ... people Lecturer ... - - verifyElementPresent link=Faculty, Jane @@ -109,11 +104,6 @@ Faculty, Jane | Assistant Professor - - verifyTextPresent - ... positions Lecturer positions Associate Professor positions Professor ... - - comment Search for professor, which should bring up Assistant Professor and Professor @@ -136,7 +126,7 @@ verifyTextPresent - Search results for 'professor' + Search results for 'professor' @@ -159,11 +149,6 @@ Faculty, Jane | Assistant Professor - - verifyTextPresent - ... positions Lecturer positions Associate Professor positions Professor ... - - verifyElementPresent link=Carroll University @@ -174,11 +159,6 @@ Carroll University | University - - verifyTextPresent - ... people Associate Professor ... - - verifyElementPresent link=Cornell University @@ -186,7 +166,7 @@ verifyTextPresent - ... people Professor ... + Cornell University | University @@ -211,7 +191,7 @@ verifyTextPresent - Search results for 'carroll' + Search results for 'carroll' @@ -256,7 +236,7 @@ verifyTextPresent - Faculty Administrative Position + faculty administrative position @@ -266,7 +246,7 @@ verifyTextPresent - Faculty, Jane Lecturer, 1977 - 1981 + Faculty, Jane, Lecturer 1977 - 1981 @@ -336,7 +316,7 @@ verifyTextPresent - Faculty Position + faculty position @@ -346,7 +326,7 @@ verifyTextPresent - Faculty, Jane Associate Professor, , 1981 - 1985 + Faculty, Jane, Associate Professor 1981 - 1985 @@ -371,7 +351,7 @@ verifyTextPresent - Faculty Position + faculty position @@ -381,7 +361,7 @@ verifyTextPresent - Faculty, Jane Associate Professor, 1986 + Faculty, Jane, Professor 1986 -