diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 index 5e932d4d..d53abcb0 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 @@ -174,6 +174,11 @@ submit + + verifyTextPresent + This field must not be empty. + + assertTitle Edit @@ -250,13 +255,13 @@ - verifyTextPresent - NIH VIVO + verifyElementPresent + link=NIH VIVO verifyTextPresent - 2009-2010 + 2009 - 2010 @@ -344,21 +349,6 @@ Verify both Co-principal Investigator roles are showing up - - verifyTextPresent - NIH VIVO - - - - verifyTextPresent - 2009-2010 - - - - verifyElementPresent - //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li/span - - verifyTextPresent VIVO Cornell Grant @@ -366,7 +356,22 @@ verifyTextPresent - 2007-2009 + 2007 - 2009 + + + + verifyElementPresent + //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li[1]/span + + + + verifyElementPresent + link=NIH VIVO + + + + verifyTextPresent + 2009 - 2010 @@ -424,16 +429,6 @@ ui-active-menuitem - - click - link=(Verify this match) - - - - waitForPopUp - verifyMatchWindow - 30000 - clickAndWait submit @@ -445,13 +440,13 @@ - comment - Add good Investigator role + verifyTextPresent + This field must not be empty. - clickAndWait - //div[@id='hasInvestigatorRole']/a + comment + Add good Investigator role @@ -526,12 +521,12 @@ verifyTextPresent - 2009-2009 + 2009 verifyElementPresent - //div[@id='hasInvestigatorRole']/ul/li/span + //div[@id='hasInvestigatorRole']/ul/li/span/a @@ -559,16 +554,6 @@ ui-active-menuitem - - click - link=(Verify this match) - - - - waitForPopUp - verifyMatchWindow - 30000 - type startYear @@ -651,7 +636,7 @@ verifyTextPresent - 2009-2010 + 2009 - 2010 @@ -666,7 +651,7 @@ verifyTextPresent - 2007-2009 + 2007 - 2009 @@ -681,7 +666,7 @@ verifyTextPresent - 2009-2009 + 2009 diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2 b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2 new file mode 100644 index 00000000..eaf40552 --- /dev/null +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2 @@ -0,0 +1,1185 @@ + + + + + + +AddFacultyMemberRoles2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AddFacultyMemberRoles2
commentAdd activities roles for Jane Faculty
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleVIVO Site Administration
commentMust login as the site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO Site Administration
commentNavigate to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
commentCancel out before adding research activity
clickAndWait//div[@id='hasResearcherRole']/a
verifyTextPresentCreate a new research activity entry for Faculty, Jane
verifyTextPresentResearch Activity Type
clickAndWaitlink=Cancel
assertTitleFaculty, Jane
commentCancel out after selecting research activity type
clickAndWait//div[@id='hasResearcherRole']/a
assertTitleEdit
selecttypeSelectorlabel=Project
verifyTextPresentProject Name
verifyTextPresentRole in Project
verifyTextPresentYears of Participation in Project
verifyTextPresentStart Year
verifyTextPresentEnd Year
clicklink=Cancel
verifyTextPresentCreate a new research activity entry for Faculty, Jane
verifyTextPresentResearch Activity Type
commentEnter research activity without a start date
selecttypeSelectorlabel=Project
verifyTextPresentProject Name
verifyTextPresentRole in Project
verifyTextPresentYears of Participation in Project
verifyTextPresentStart Year
verifyTextPresentEnd Year
typerelatedIndLabelHistory of Apes in Africa
typenewIndLabelConsultant
typestartYear2010
clickAndWaitsubmit
commentAdd research activity - project
verifyTextPresentProject Name
verifyTextPresentRole in Project
verifyTextPresentYears of Participation in Project
verifyTextPresentStart Year
verifyTextPresentEnd Year
typerelatedIndLabelHistory of Apes in Africa
typenewIndLabelConsultant
clickAndWaitsubmit
assertTitleEdit
assertTitleHistory of Apes in Africa
commentNavigate to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
commentAdd research activity - grant
clickAndWait//div[@id='hasResearcherRole']/a
assertTitleEdit
selecttypeSelectorlabel=Grant
verifyTextPresentGrant Name
verifyTextPresentRole in Grant
verifyTextPresentYears of Participation in Grant
verifyTextPresentStart Year
verifyTextPresentEnd Year
typerelatedIndLabelHabitats for Apes
typenewIndLabelResearcher
typestartYear1980
typeendYear1985
clickAndWaitsubmit
assertTitleHabitats for Apes
commentNavigate back to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
commentAdd teaching activity - conference
clickAndWait//div[@id='hasTeacherRole']/a
assertTitleEdit
verifyTextPresentCreate a new teaching activity entry for Faculty, Jane
verifyTextPresentTeaching Activity Type
selecttypeSelectorlabel=Conference
verifyTextPresentConference Name
verifyTextPresentRole in Conference
verifyTextPresentYears of Participation in Conference
verifyTextPresentStart Year
verifyTextPresentEnd Year
typerelatedIndLabelApe World
typenewIndLabelPlanner
typestartYear2009
typeendYear2009
clickAndWaitsubmit
assertTitleApe World
commentNavigate back to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
commentAdd teaching activity - course
clickAndWait//div[@id='hasTeacherRole']/a
assertTitleEdit
selecttypeSelectorlabel=Course
verifyTextPresentCreate a new teaching activity entry for Faculty, Jane
verifyTextPresentTeaching Activity Type
verifyTextPresentCourse Name
verifyTextPresentRole in Course
verifyTextPresentYears of Participation in Course
verifyTextPresentStart Year
verifyTextPresentEnd Year
typerelatedIndLabelIntroduction to the Ape World
typenewIndLabelCreator
typestartYear2000
typeendYear2001
clickAndWaitsubmit
assertTitleIntroduction to the Ape World
commentNavigate back to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
commentAdd teaching activity - workshop
clickAndWait//div[@id='hasTeacherRole']/a
assertTitleEdit
selecttypeSelectorlabel=Workshop
verifyTextPresentCreate a new teaching activity entry for Faculty, Jane
verifyTextPresentTeaching Activity Type
verifyTextPresentWorkshop Name
verifyTextPresentRole in Workshop
verifyTextPresentYears of Participation in Workshop
verifyTextPresentStart Year
verifyTextPresentEnd Year
typerelatedIndLabelWorking with Primates
typenewIndLabelCo-Instructor
typestartYear2000
typeendYear2005
clickAndWaitsubmit
assertTitleWorking with Primates
commentNavigate back to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
commentAdd clinical activity - project
clickAndWait//div[@id='hasClinicalRole']/a
assertTitleEdit
verifyTextPresentCreate a new clinical activity entry for Faculty, Jane
verifyTextPresentClinical Activity Type
selecttypeSelectorlabel=Project
verifyTextPresentCreate a new clinical activity entry for Faculty, Jane
verifyTextPresentClinical Activity Type
verifyTextPresentProject Name
verifyTextPresentRole in Project
verifyTextPresentYears of Participation in Project
verifyTextPresentStart Year
verifyTextPresentEnd Year
typerelatedIndLabelPrototype New Ape Home
typenewIndLabelDesigner
typestartYear1990
typeendYear1991
clickAndWaitsubmit
assertTitlePrototype New Ape Home
commentNavigate back to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
commentAdd clinical activity - service
clickAndWait//div[@id='hasClinicalRole']/a
assertTitleEdit
verifyTextPresentCreate a new clinical activity entry for Faculty, Jane
verifyTextPresentClinical Activity Type
selecttypeSelectorlabel=Service
verifyTextPresentCreate a new clinical activity entry for Faculty, Jane
verifyTextPresentClinical Activity Type
verifyTextPresentService Name
verifyTextPresentRole in Service
verifyTextPresentYears of Participation in Service
verifyTextPresentStart Year
verifyTextPresentEnd Year
typerelatedIndLabelApe Health Program
typenewIndLabelFounder
typestartYear1993
typeendYear
clickAndWaitsubmit
assertTitleApe Health Program
commentNavigate back to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
commentVerify activities displayed for Jane Faculty
verifyElementPresentlink=Prototype New Ape Home
verifyTextPresentDesigner 1990 - 1991
verifyElementPresentlink=Ape Health Program
verifyTextPresentFounder 1993 -
verifyElementPresentlink=History of Apes in Africa
verifyTextPresentConsultant 2010 -
verifyElementPresentlink=Habitats for Apes
verifyTextPresentResearcher 1980 - 1985
verifyElementPresentlink=Working with Primates
verifyTextPresentCo-Instructor 2000 - 2005
verifyElementPresentlink=Introduction to the Ape World
verifyTextPresentCreator 2000 - 2001
verifyElementPresentlink=Ape World
verifyTextPresentPlanner 2009
commentLog out
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1 b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1 new file mode 100644 index 00000000..6051cdc2 --- /dev/null +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1 @@ -0,0 +1,145 @@ + + + + + + +AddLibrarianRoles1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AddLibrarianRoles1
commentAdd 3 roles for Lily Librarian
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleVIVO Site Administration
commentMust login as the site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO Site Administration
commentNavigate to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Librarian, Lily
assertTitleLibrarian, Lily
commentLog out
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2 b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2 new file mode 100644 index 00000000..6051cdc2 --- /dev/null +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2 @@ -0,0 +1,145 @@ + + + + + + +AddLibrarianRoles1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AddLibrarianRoles1
commentAdd 3 roles for Lily Librarian
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleVIVO Site Administration
commentMust login as the site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO Site Administration
commentNavigate to Jane Faculty
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Librarian, Lily
assertTitleLibrarian, Lily
commentLog out
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/AddRoles/suite.html b/utilities/acceptance-tests/suites/AddRoles/suite.html index d30d7bab..c6bc91c3 100644 --- a/utilities/acceptance-tests/suites/AddRoles/suite.html +++ b/utilities/acceptance-tests/suites/AddRoles/suite.html @@ -11,6 +11,10 @@ CreateTestFacultyMember CreateTestLibrarian AddFacultyMemberRoles1 +AddFacultyMemberRoles2 +AddLibrarianRoles1 +AddLibrarianRoles2 VerifyAllRolesSearchable DeleteTestFacultyMember DeleteTestLibrarian