From 312c5db6fa9e3b9c4136ec9784917a742dd4a3df Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Fri, 14 Mar 2014 09:54:07 -0400 Subject: [PATCH] Holly made more test case changes... --- .../CheckVisualizations/AddCoAuthors.html | 6 +- .../AddCoInvestigators.html | 8 +-- .../suites/CheckVisualizations/AddGrants.html | 4 +- .../CheckVisualizations/AddPublications.html | 6 +- .../CheckVisualizations/CheckGrantDates.html | 4 +- .../TestTemporalGraphs.html | 70 +++---------------- .../suites/CustomAdvisesForm/AddAdvises.html | 13 ++-- .../CustomAdvisesForm/ChangeAdvises.html | 4 +- .../CustomAdvisesForm/CheckIndexView.html | 7 +- .../suites/CustomAwardsForm/AddAwards.html | 5 -- .../suites/CustomAwardsForm/ChangeAwards.html | 4 +- .../suites/InitialSetup/EditSiteInfo.html | 18 ++--- 12 files changed, 47 insertions(+), 102 deletions(-) diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html index ad8a93b4..67ccdd63 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html @@ -291,7 +291,7 @@ verifyTextPresent - 3 in the last 10 full + 2 in the last 10 full @@ -386,7 +386,7 @@ verifyTextPresent - from 2001 to 2012 + from 2001 to 2013 @@ -401,7 +401,7 @@ verifyTextPresent - from 2001 to 2012 + from 2001 to 2013 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html index 7759eeac..b34cc783 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html @@ -356,7 +356,7 @@ verifyTextPresent - from 2002 through 2012 + from 2002 through 2013 @@ -371,7 +371,7 @@ verifyTextPresent - from 2002 through 2012 + from 2002 through 2013 @@ -567,7 +567,7 @@ verifyTextPresent - from 2001 to 2012 + from 2001 to 2013 @@ -582,7 +582,7 @@ verifyTextPresent - from 2001 to 2012 + from 2001 to 2013 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html index 6ad34060..6cacf90f 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html @@ -297,7 +297,7 @@ verifyTextPresent - from 2002 through 2012 + from 2002 through 2013 @@ -312,7 +312,7 @@ verifyTextPresent - from 2003 through 2012 + from 2004 through 2013 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html index 3527acdc..bf173417 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -792,7 +792,7 @@ verifyTextPresent - 3 in the last 10 full + 2 in the last 10 full @@ -872,7 +872,7 @@ verifyTextPresent - from 2001 to 2012 + from 2001 to 2013 @@ -887,7 +887,7 @@ verifyTextPresent - from 2003 to 2012 + from 2004 to 2013 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html index be46b954..e00e5b4f 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html @@ -801,7 +801,7 @@ verifyTextPresent - from 2003 through 2012 + from 2004 through 2013 @@ -816,7 +816,7 @@ verifyTextPresent - from 2003 through 2012 + from 2004 through 2013 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index d37cddfe..ee215155 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -489,61 +489,31 @@ Comparing publications of People in Child Development - - verifyTextPresent - 2001 - - verifyTextPresent 2002 - - verifyTextPresent - 2003 - - verifyTextPresent 2004 - - verifyTextPresent - 2005 - - verifyTextPresent 2006 - - verifyTextPresent - 2007 - - verifyTextPresent 2008 - - verifyTextPresent - 2009 - - verifyTextPresent 2010 - - verifyTextPresent - 2011 - - verifyTextPresent 2012 @@ -781,6 +751,11 @@ 2012 + + verifyTextPresent + 2013 + + verifyTextPresent Total Number of grants @@ -1009,61 +984,31 @@ Comparing publications of Organizations in College of Human Ecology - - verifyTextPresent - 2001 - - verifyTextPresent 2002 - - verifyTextPresent - 2003 - - verifyTextPresent 2004 - - verifyTextPresent - 2005 - - verifyTextPresent 2006 - - verifyTextPresent - 2007 - - verifyTextPresent 2008 - - verifyTextPresent - 2009 - - verifyTextPresent 2010 - - verifyTextPresent - 2011 - - verifyTextPresent 2012 @@ -1281,6 +1226,11 @@ 2012 + + verifyTextPresent + 2013 + + verifyTextPresent Total Number of grants diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html index 9f9f0ceb..4288e60e 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html @@ -91,9 +91,14 @@ //div[@id='wrapper-content']/ul/li[8] + + selectWindow + null + + clickAndWait - xpath=(//img[@alt='add'])[28] + xpath=(//img[@alt='add'])[29] @@ -154,7 +159,7 @@ clickAndWait - xpath=(//img[@alt='add'])[28] + xpath=(//img[@alt='add'])[29] @@ -275,7 +280,7 @@ clickAndWait - xpath=(//img[@alt='add'])[28] + xpath=(//img[@alt='add'])[29] @@ -357,7 +362,7 @@ clickAndWait - xpath=(//img[@alt='add'])[28] + xpath=(//img[@alt='add'])[29] diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html index 290b265b..a72aba11 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html @@ -211,7 +211,7 @@ clickAndWait - xpath=(//img[@alt='edit this entry'])[4] + xpath=(//img[@alt='edit this entry'])[3] @@ -293,7 +293,7 @@ clickAndWait - xpath=(//img[@alt='edit this entry'])[5] + xpath=(//img[@alt='edit this entry'])[4] diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html index 1973b830..695eabb6 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html @@ -65,11 +65,6 @@ Faculty Member - - verifyTextPresent - Faculty, Jane Assistant Professor - - verifyElementPresent link=Faculty, Jane @@ -122,7 +117,7 @@ verifyTextPresent - Faculty, Jane Assistant Professor + Faculty, Jane Faculty Member diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html index 56866b16..88030d1f 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html @@ -420,11 +420,6 @@ Award or Honor - - selectWindow - null - - verifyElementPresent link=Best Professor (Faculty, Jane - 2012) diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html index 48af6488..ce8cc7b4 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html @@ -211,7 +211,7 @@ clickAndWait - xpath=(//img[@alt='edit this entry'])[4] + xpath=(//img[@alt='edit this entry'])[5] @@ -293,7 +293,7 @@ clickAndWait - css=a.edit-relatedBy > img.edit-individual + xpath=(//img[@alt='edit this entry'])[5] diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index a5b9b134..612c1500 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html @@ -130,7 +130,7 @@ verifyTextPresent - ©2013 VIVO Project + ©2014 VIVO Project @@ -283,7 +283,7 @@ verifyTextPresent - ©2013 VIVO Project + ©2014 VIVO Project @@ -303,12 +303,12 @@ verifyTextPresent - Version rel-1.6.1-rc1 + Version rel-1.6.1-rc2 verifyElementPresent - link=rel-1.6.1-rc1 + link=rel-1.6.1-rc2 @@ -507,7 +507,7 @@ verifyTextPresent - ©2013 + ©2014 @@ -532,7 +532,7 @@ verifyTextPresent - Version rel-1.6-rc5 + Version rel-1.6.1-rc2 @@ -619,7 +619,7 @@ verifyTextPresent - ©2013 VIVO Project + ©2014 VIVO Project @@ -639,12 +639,12 @@ verifyTextPresent - Version rel-1.6.1-rc1 + Version rel-1.6.1-rc2 verifyElementPresent - link=rel-1.6.1-rc1 + link=rel-1.6.1-rc2