diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 index d53abcb0..a1a35e7f 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 @@ -139,6 +139,31 @@ Edit + + verifyTextPresent + Create a new co-principal investigator entry for Faculty, Jane + + + + verifyTextPresent + Grant Name + + + + verifyTextPresent + Years of Participation in Grant + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + clickAndWait link=Cancel @@ -164,6 +189,31 @@ Edit + + verifyTextPresent + Create a new co-principal investigator entry for Faculty, Jane + + + + verifyTextPresent + Grant Name + + + + verifyTextPresent + Years of Participation in Grant + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + type relatedIndLabel @@ -189,6 +239,31 @@ Add good Co-principal Investigator role + + verifyTextPresent + Create a new co-principal investigator entry for Faculty, Jane + + + + verifyTextPresent + Grant Name + + + + verifyTextPresent + Years of Participation in Grant + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + type relatedIndLabel @@ -284,6 +359,31 @@ Edit + + verifyTextPresent + Create a new co-principal investigator entry for Faculty, Jane + + + + verifyTextPresent + Grant Name + + + + verifyTextPresent + Years of Participation in Grant + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + type relatedIndLabel @@ -394,6 +494,31 @@ Edit + + verifyTextPresent + Create a new investigator entry for Faculty, Jane + + + + verifyTextPresent + Grant Name + + + + verifyTextPresent + Years of Participation in Grant + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + clickAndWait link=Cancel @@ -419,6 +544,31 @@ Edit + + verifyTextPresent + Create a new investigator entry for Faculty, Jane + + + + verifyTextPresent + Grant Name + + + + verifyTextPresent + Years of Participation in Grant + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + type relatedIndLabel @@ -449,6 +599,31 @@ Add good Investigator role + + verifyTextPresent + Create a new investigator entry for Faculty, Jane + + + + verifyTextPresent + Grant Name + + + + verifyTextPresent + Years of Participation in Grant + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + type relatedIndLabel @@ -544,6 +719,31 @@ Edit + + verifyTextPresent + Create a new principal investigator entry for Faculty, Jane + + + + verifyTextPresent + Grant Name + + + + verifyTextPresent + Years of Participation in Grant + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + type relatedIndLabel @@ -666,7 +866,7 @@ verifyTextPresent - 2009 + 2009 diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2 b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2 index 3eb49231..9b8e2430 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2 +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2 @@ -169,11 +169,31 @@ Edit + + verifyTextPresent + Create a new research activity entry for Faculty, Jane + + + + verifyTextPresent + Research Activity Type + + select typeSelector label=Project + + verifyTextPresent + Create a new research activity entry for Faculty, Jane + + + + verifyTextPresent + Research Activity Type + + verifyTextPresent Project Name @@ -204,6 +224,11 @@ link=Cancel + + comment + Enter research activity without a start date + + verifyTextPresent Create a new research activity entry for Faculty, Jane @@ -214,9 +239,79 @@ Research Activity Type + + select + typeSelector + label=Project + + + verifyTextPresent + Create a new research activity entry for Faculty, Jane + + + + verifyTextPresent + Research Activity Type + + + + verifyTextPresent + Project Name + + + + verifyTextPresent + Role in Project + + + + verifyTextPresent + Years of Participation in Project + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + + + type + relatedIndLabel + History of Apes in Africa + + + type + newIndLabel + Consultant + + + type + startYear + + + + clickAndWait + submit + + comment - Enter research activity without a start date + Add research activity - project + + + + verifyTextPresent + Create a new research activity entry for Faculty, Jane + + + + verifyTextPresent + Research Activity Type @@ -224,6 +319,16 @@ typeSelector label=Project + + verifyTextPresent + Create a new research activity entry for Faculty, Jane + + + + verifyTextPresent + Research Activity Type + + verifyTextPresent Project Name @@ -304,96 +409,6 @@ Faculty, Jane - - comment - Add research activity - project - - - - verifyTextPresent - Project Name - - - - verifyTextPresent - Role in Project - - - - verifyTextPresent - Years of Participation in Project - - - - verifyTextPresent - Start Year - - - - verifyTextPresent - End Year - - - - type - relatedIndLabel - History of Apes in Africa - - - type - newIndLabel - Consultant - - - clickAndWait - submit - - - - assertTitle - Edit - - - - assertTitle - History of Apes in Africa - - - - comment - Navigate to Jane Faculty - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Faculty Member - - - - assertTitle - Faculty Member - - - - clickAndWait - link=Faculty, Jane - - - - assertTitle - Faculty, Jane - - comment Add research activity - grant @@ -409,11 +424,31 @@ Edit + + verifyTextPresent + Create a new research activity entry for Faculty, Jane + + + + verifyTextPresent + Research Activity Type + + select typeSelector label=Grant + + verifyTextPresent + Create a new research activity entry for Faculty, Jane + + + + verifyTextPresent + Research Activity Type + + verifyTextPresent Grant Name diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1 b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1 index 6051cdc2..a421094c 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1 +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1 @@ -106,12 +106,12 @@ clickAndWait - link=Faculty Member + link=Librarian assertTitle - Faculty Member + Librarian @@ -124,6 +124,491 @@ Librarian, Lily + + comment + Start to add presentation and cancel out + + + + clickAndWait + //div[@id='hasPresenterRole']/a + + + + assertTitle + Edit + + + + verifyTextPresent + Create a new presentation entry for Librarian, Lily + + + + verifyTextPresent + Presentation Type + + + + clickAndWait + link=Cancel + + + + assertTitle + Librarian, Lily + + + + comment + Select presentation type then cancel out + + + + clickAndWait + //div[@id='hasPresenterRole']/a + + + + assertTitle + Edit + + + + select + typeSelector + label=Presentation + + + verifyTextPresent + Create a new presentation entry for Librarian, Lily + + + + verifyTextPresent + Presentation Type + + + + verifyTextPresent + Presentation Name + + + + verifyTextPresent + Role in Presentation + + + + verifyTextPresent + Year + + + + click + link=Cancel + + + + comment + Start to add presentation again, but enter no required field + + + + verifyTextPresent + Create a new presentation entry for Librarian, Lily + + + + open + /vivo/edit/editRequestDispatch.jsp?subjectUri=http%3A%2F%2Fvivo.local.edu%2Findividual%2Fn6284&predicateUri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23hasPresenterRole + + + + select + typeSelector + label=Presentation + + + verifyTextPresent + Presentation Name + + + + verifyTextPresent + Role in Presentation + + + + verifyTextPresent + Year + + + + clickAndWait + submit + + + + assertTitle + Edit + + + + verifyTextPresent + This field must not be empty. + + + + comment + Start to add presentation again, but enter only first required field + + + + verifyTextPresent + Create a new presentation entry for Librarian, Lily + + + + open + /vivo/edit/editRequestDispatch.jsp?subjectUri=http%3A%2F%2Fvivo.local.edu%2Findividual%2Fn6284&predicateUri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23hasPresenterRole + + + + select + typeSelector + label=Presentation + + + verifyTextPresent + Presentation Name + + + + verifyTextPresent + Role in Presentation + + + + verifyTextPresent + Year + + + + type + relatedIndLabel + Researching Primates + + + clickAndWait + submit + + + + assertTitle + Edit + + + + verifyTextPresent + This field must not be empty. + + + + comment + Start to add presentation again, but enter only first 2 required fields + + + + verifyTextPresent + Create a new presentation entry for Librarian, Lily + + + + verifyTextPresent + Presentation Type + + + + verifyTextPresent + Presentation Name + + + + verifyTextPresent + Role in Presentation + + + + verifyTextPresent + Year + + + + type + relatedIndLabel + Researching Primates + + + type + newIndLabel + Presenter + + + clickAndWait + submit + + + + assertTitle + Edit + + + + verifyTextPresent + This field must not be empty. + + + + comment + Add presentation correctly + + + + verifyTextPresent + Create a new presentation entry for Librarian, Lily + + + + verifyTextPresent + Presentation Type + + + + verifyTextPresent + Presentation Name + + + + verifyTextPresent + Role in Presentation + + + + verifyTextPresent + Year + + + + type + relatedIndLabel + Researching Primates + + + type + newIndLabel + Presenter + + + type + startYear + 2009 + + + clickAndWait + submit + + + + assertTitle + Researching Primates + + + + comment + Navigate back to Jane Faculty + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Librarian + + + + assertTitle + Librarian + + + + clickAndWait + link=Librarian, Lily + + + + assertTitle + Librarian, Lily + + + + comment + Add presentation correctly + + + + clickAndWait + //div[@id='hasPresenterRole']/a + + + + assertTitle + Edit + + + + verifyTextPresent + Create a new presentation entry for Librarian, Lily + + + + verifyTextPresent + Presentation Type + + + + select + typeSelector + label=Invited Talk + + + verifyTextPresent + Create a new presentation entry for Librarian, Lily + + + + verifyTextPresent + Presentation Type + + + + verifyTextPresent + Invited Talk Name + + + + verifyTextPresent + Role in Invited Talk + + + + verifyTextPresent + Year + + + + type + relatedIndLabel + Animal Librarianship + + + type + newIndLabel + Member of panel + + + type + startYear + 2003 + + + clickAndWait + submit + + + + assertTitle + Animal Librarianship + + + + comment + Navigate back to Jane Faculty + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Librarian + + + + assertTitle + Librarian + + + + clickAndWait + link=Librarian, Lily + + + + assertTitle + Librarian, Lily + + + + comment + Verify presentations display + + + + verifyElementPresent + link=Animal Librarianship + + + + verifyTextPresent + Member of panel 2003 + + + + verifyElementPresent + //div[@id='hasPresenterRole']/ul/li[1]/span + + + + verifyElementPresent + link=Researching Primates + + + + verifyTextPresent + Presenter 2009 + + + + verifyElementPresent + //div[@id='hasPresenterRole']/ul/li/span + + comment Log out diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2 b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2 index 6051cdc2..948e581a 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2 +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2 @@ -4,7 +4,7 @@ -AddLibrarianRoles1 +AddLibrarianRoles2