diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 index bc309191..8e1a3bb7 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 @@ -31,7 +31,7 @@ comment - Add roles for Jane Faculty + Add grant roles for Jane Faculty @@ -126,7 +126,7 @@ comment - Add Co-principal Investigator role for Jane Faculty + Cancel out before adding Co-principal Investigator @@ -139,6 +139,56 @@ Edit + + clickAndWait + link=Cancel + + + + assertTitle + Jane Faculty + + + + comment + Enter invalid Co-principal Investigator role + + + + clickAndWait + //div[@id='hasCo-PrincipalInvestigatorRole']/a + + + + assertTitle + Edit + + + + type + relatedIndLabel + NIH VIVO + + + clickAndWait + submit + + + + assertTitle + Edit + + + + comment + Add good Co-principal Investigator role + + + + clickAndWait + //div[@id='hasCo-PrincipalInvestigatorRole']/a + + type relatedIndLabel @@ -201,7 +251,7 @@ comment - Verify that Co-principal Investigator role is showing up + Verify Co-principal Investigator role is showing up @@ -221,12 +271,12 @@ comment - Add Principal Investigator role for Jane Faculty + Add second Co-principal Investigator role clickAndWait - //div[@id='hasPrincipalInvestigatorRole']/a + //div[@id='hasCo-PrincipalInvestigatorRole']/a @@ -237,22 +287,17 @@ type relatedIndLabel - NIH - - - click - ui-active-menuitem - + VIVO Cornell Grant type startYear - 2010 + 2007 type endYear - 2011 + 2009 clickAndWait @@ -261,7 +306,7 @@ assertTitle - NIH VIVO + VIVO Cornell Grant @@ -301,7 +346,7 @@ comment - Verify that Principal Investigator role is showing up + Verify both Co-principal Investigator roles are showing up @@ -311,17 +356,57 @@ verifyTextPresent - 2010-2011 + 2009-2010 verifyElementPresent - //div[@id='hasPrincipalInvestigatorRole']/ul/li/span/a + //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li/span + + + + verifyTextPresent + VIVO Cornell Grant + + + + verifyTextPresent + 2007-2009 + + + + verifyElementPresent + //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li[2]/span comment - Add Investigator role for Jane Faculty + Cancel out before adding Investigator + + + + clickAndWait + //div[@id='hasInvestigatorRole']/a + + + + assertTitle + Edit + + + + clickAndWait + link=Cancel + + + + assertTitle + Jane Faculty + + + + comment + Enter invalid Investigator role @@ -337,12 +422,52 @@ type relatedIndLabel - DataStaR + VIVO Cornell Grant + + + click + ui-active-menuitem + + + + click + link=(Verify this match) + + + + waitForPopUp + verifyMatchWindow + 30000 + + + clickAndWait + submit + + + + assertTitle + Edit + + + + comment + Add good Investigator role + + + + clickAndWait + //div[@id='hasInvestigatorRole']/a + + + + type + relatedIndLabel + VIVO Cornell Grant type startYear - 2008 + 2009 type @@ -356,7 +481,7 @@ assertTitle - DataStaR + VIVO Cornell Grant @@ -401,12 +526,12 @@ verifyTextPresent - DataStaR + VIVO Cornell Grant verifyTextPresent - 2008-2009 + 2009-2009 @@ -416,7 +541,7 @@ comment - Add second Principal investigator for Jane Faculty + Add Principal Investigator role @@ -432,13 +557,23 @@ type relatedIndLabel - Dat + NIH VIVO click ui-active-menuitem + + click + link=(Verify this match) + + + + waitForPopUp + verifyMatchWindow + 30000 + type startYear @@ -451,7 +586,7 @@ assertTitle - DataStaR + NIH VIVO @@ -496,7 +631,7 @@ verifyTextPresent - DataStaR + NIH VIVO @@ -506,7 +641,72 @@ verifyElementPresent - //div[@id='hasPrincipalInvestigatorRole']/ul/li[1]/span + //div[@id='hasPrincipalInvestigatorRole']/ul/li/span + + + + comment + Verify that all grant roles are still there + + + + verifyTextPresent + NIH VIVO + + + + verifyTextPresent + 2009-2010 + + + + verifyElementPresent + //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li/span + + + + verifyTextPresent + VIVO Cornell Grant + + + + verifyTextPresent + 2007-2009 + + + + verifyElementPresent + //div[@id='hasCo-PrincipalInvestigatorRole']/ul/li[2]/span + + + + verifyTextPresent + VIVO Cornell Grant + + + + verifyTextPresent + 2009-2009 + + + + verifyElementPresent + //div[@id='hasInvestigatorRole']/ul/li/span + + + + verifyTextPresent + NIH VIVO + + + + verifyTextPresent + 2010 + + + + verifyElementPresent + //div[@id='hasPrincipalInvestigatorRole']/ul/li/span diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html index 779ad449..f0ce5980 100644 --- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html +++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html @@ -31,7 +31,7 @@ comment - Verify all 8 roles are searchable + Verify all roles are searchable @@ -56,13 +56,13 @@ comment - Search for RESEARCHER--will find 2 research focus roles + Search for VIVO type search - researcher + VIVO clickAndWait @@ -71,242 +71,27 @@ assertTitle - researcher - VIVO Search Results - - - - verifyElementPresent - link=Cancer Treatment Drug Interactions - - - - verifyTextPresent - ... Testing new cancer treatment drugs with other drugs to determine interactions. start year and month 2001-01 end year and month 2002-01 role Lead Researcher research activity by Jane Faculty ... - - - - verifyElementPresent - link=Relationship Between Stress and Children - - - - verifyTextPresent - ... Testing to determine if having children makes your life more stressful. start year and month 2003-03 end year and month 2007-03 role Consulting Researcher research activity by Jane Faculty ... + VIVO - VIVO Search Results comment - Search for PROFESSOR--will find 1 teaching focus role - - - - type - search - professor - - - clickAndWait - submit - - - - assertTitle - professor - VIVO Search Results - - - - verifyElementPresent - link=Drug Interactions + Verify search results for VIVO verifyTextPresent - ... Teaching how drugs interact with one another. start year and month 2001-02 end year and month 2012-02 role Associate Professor teaching activity by Jane Faculty ... - - - - verifyElementPresent - link=Jane Faculty + VIVO verifyTextPresent - Assistant Professor - - - - comment - Search for LECTURER--will find 1 teaching focus role - - - - type - search - lecturer - - - clickAndWait - submit - - - - assertTitle - lecturer - VIVO Search Results - - - - verifyElementPresent - link=Public lectures on reducing stress - - - - verifyElementPresent - link=Introduction to Drugs + VIVO Cornell Grant verifyTextPresent - ... Intoduces first year pre-med students to drugs. start year and month 2003-04 end year and month 2007-04 role Lecturer teaching activity by Jane Faculty ... - - - - verifyElementPresent - link=Jane Faculty - - - - verifyTextPresent - Assistant Professor - - - - comment - For some reason verifying of the last line in the search results bombs out - - - - comment - Search for FOUNDER--will find 1 outreach focus role - - - - type - search - founder - - - clickAndWait - submit - - - - assertTitle - founder - VIVO Search Results - - - - verifyElementPresent - link=Free Cancer Screening Clinic - - - - verifyTextPresent - ... Founder of clinic to conduct free cancer screenings. start year and month 2001-12 end year and month 2012-12 role Founder outreach activity by Jane Faculty ... - - - - comment - Search for SPEAKER--will find 1 outreach focus role - - - - type - search - speaker - - - clickAndWait - submit - - - - assertTitle - speaker - VIVO Search Results - - - - verifyElementPresent - link=Public lectures on reducing stress - - - - verifyTextPresent - ... Providing helpful ideas and answer questions about reducing stress. start year and month 2005-05 end year and month 2006-06 role Speaker outreach activity by Jane Faculty ... - - - - comment - Search for PRESIDENT--will find 1 professional service role - - - - type - search - president - - - clickAndWait - submit - - - - assertTitle - president - VIVO Search Results - - - - verifyElementPresent - link=AMA - - - - verifyTextPresent - ... Won election. start year and month 2008-08 end year and month 2009-09 role President professional activity by Jane Faculty - - - - comment - Search for DOCTOR--will find 1 professional service role - - - - type - search - doctor - - - clickAndWait - submit - - - - clickAndWait - link=2 - - - - assertTitle - doctor - VIVO Search Results - - - - verifyElementPresent - link=Private practice - - - - verifyTextPresent - ... Practice focuses on reducing stress while taking cancer drugs. start year and month 1990-06 role Doctor professional activity by Jane Faculty ... + NIH VIVO