diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html index dc5aa437..377095c4 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html @@ -351,17 +351,17 @@ verifyTextPresent - 3 publications + Publications in VIVO verifyTextPresent - within the last 10 + 4 in the last 10 full verifyTextPresent - years (4 total) + years @@ -369,6 +369,11 @@ link=Co-Author Network + + verifyElementPresent + link=Map Of Science + + verifyElementNotPresent link=Co-Investigator Network @@ -396,12 +401,12 @@ verifyTextPresent - Associate Professor + Co-Author Network verifyTextPresent - VIVO profile | Co-author network + VIVO profile @@ -431,7 +436,7 @@ verifyTextPresent - from 2001 to 2011 + from 2001 to 2010 @@ -441,7 +446,12 @@ verifyTextPresent - from 2001 to 2011 + from 2001 to 2010 + + + + verifyTextPresent + Tables @@ -494,6 +504,16 @@ Co-authors + + verifyTextPresent + Publications with + + + + verifyTextPresent + Furter, Frank + + verifyTextPresent Smith, Sally diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html index 8978261a..b4410e99 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html @@ -151,12 +151,12 @@ type - startField.year + startField-year 2007 type - endField.year + endField-year 2008 @@ -221,7 +221,7 @@ type - startField.year + startField-year 2010 @@ -281,7 +281,7 @@ type - startField.year + startField-year 2010 @@ -346,12 +346,12 @@ verifyTextPresent - Associate Professor + Co-Investigator Network verifyTextPresent - VIVO profile | Co-investigator network + VIVO profile @@ -381,7 +381,7 @@ verifyTextPresent - from 2002 to 2011 + from 2001 to 2010 @@ -391,7 +391,7 @@ verifyTextPresent - from 2002 to 2011 + from 2001 to 2010 @@ -444,6 +444,16 @@ Co-investigators + + verifyTextPresent + Grants with + + + + verifyTextPresent + Furter, Frank + + verifyTextPresent Zink, Zoe @@ -509,6 +519,11 @@ Furter, Frank - Person Level Visualization + + verifyTextPresent + Co-Author Network + + verifyTextPresent 4   Publication(s) @@ -536,7 +551,7 @@ verifyTextPresent - from 2001 to 2011 + from 2001 to 2010 @@ -546,7 +561,7 @@ verifyTextPresent - from 2001 to 2011 + from 2001 to 2010 @@ -594,6 +609,16 @@ Co-authors + + verifyTextPresent + Publications with + + + + verifyTextPresent + Furter, Frank + + verifyTextPresent 1 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html index fc77bfef..88c2857f 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html @@ -141,12 +141,12 @@ type - startField.year + startField-year 2002 type - endField.year + endField-year 2004 @@ -181,7 +181,7 @@ type - startField.year + startField-year 2006 @@ -216,12 +216,12 @@ type - startField.year + startField-year 2007 type - endField.year + endField-year 2008 @@ -256,7 +256,7 @@ type - startField.year + startField-year 2010 @@ -294,6 +294,11 @@ link=Co-Author Network + + verifyTextPresent + Co-Investigator Network + + verifyTextPresent 4   Grant(s) @@ -321,7 +326,7 @@ verifyTextPresent - from 2002 to 2011 + from 2001 to 2010 @@ -331,7 +336,7 @@ verifyTextPresent - from 2002 to 2011 + from 2001 to 2010 @@ -386,7 +391,7 @@ verifyTextPresent - from 2002 to 2011 + from 2001 to 2010 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html index 40b91bef..9d53c374 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -801,17 +801,17 @@ verifyTextPresent - 3 publications + Publications in VIVO verifyTextPresent - within the last 10 + 4 in the last 10 full verifyTextPresent - years (4 total) + years @@ -824,6 +824,11 @@ link=Co-Investigator Network + + verifyElementPresent + link=Map Of Science + + clickAndWait link=Co-Author Network @@ -839,6 +844,11 @@ Furter, Frank - Person Level Visualization + + verifyTextPresent + Co-Author Network + + verifyTextPresent 4   Publication(s) @@ -866,7 +876,7 @@ verifyTextPresent - from 2001 to 2011 + from 2001 to 2010 @@ -876,7 +886,12 @@ verifyTextPresent - from 2001 to 2011 + from 2001 to 2010 + + + + verifyTextPresent + Tables diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html index 866fbeb3..2cbb3585 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html @@ -136,7 +136,7 @@ type - startField.year + startField-year 2005 @@ -191,7 +191,7 @@ type - startField.year + startField-year 2005 @@ -246,7 +246,7 @@ type - startField.year + startField-year 2011 @@ -301,7 +301,7 @@ type - startField.year + startField-year 2011 @@ -366,12 +366,12 @@ verifyTextPresent - Associate Professor + Co-Investigator Network verifyTextPresent - VIVO profile | Co-investigator network + VIVO profile @@ -401,7 +401,7 @@ verifyTextPresent - from 2002 to 2011 + from 2001 to 2010 @@ -411,7 +411,7 @@ verifyTextPresent - from 2002 to 2011 + from 2001 to 2010 @@ -531,12 +531,12 @@ type - startField.year + startField-year type - endField.year + endField-year @@ -561,7 +561,7 @@ type - startField.year + startField-year @@ -586,12 +586,12 @@ type - startField.year + startField-year type - endField.year + endField-year @@ -616,7 +616,7 @@ type - startField.year + startField-year @@ -681,12 +681,12 @@ verifyTextPresent - Associate Professor + Co-Investigator Network verifyTextPresent - VIVO profile | Co-investigator network + VIVO profile @@ -711,22 +711,22 @@ verifyTextPresent - 4 grants + 2 grants verifyTextPresent - from 2002 to 2011 + from 2001 to 2010 verifyTextPresent - 2 co-investigators + 1 co-investigator verifyTextPresent - from 2002 to 2011 + from 2001 to 2010 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html index 9b901418..c43614d1 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html @@ -161,7 +161,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -180,7 +180,7 @@ - pause + waitForPageToLoad 5000 @@ -226,7 +226,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -245,10 +245,15 @@ - pause + waitForPageToLoad 5000 + + assertTitle + VIVO Site Administration + + clickAndWait link=Index @@ -286,7 +291,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -305,7 +310,7 @@ - pause + waitForPageToLoad 5000 @@ -351,7 +356,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -370,7 +375,7 @@ - pause + waitForPageToLoad 5000 @@ -421,7 +426,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -440,7 +445,7 @@ - pause + waitForPageToLoad 5000 @@ -491,7 +496,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -510,7 +515,7 @@ - pause + waitForPageToLoad 5000 @@ -561,7 +566,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -580,7 +585,7 @@ - pause + waitForPageToLoad 5000 @@ -626,7 +631,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -645,7 +650,7 @@ - pause + waitForPageToLoad 5000 @@ -685,32 +690,7 @@ - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - pause + waitForPageToLoad 5000 @@ -756,7 +736,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -775,7 +755,7 @@ - pause + waitForPageToLoad 5000 @@ -821,7 +801,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -840,7 +820,7 @@ - pause + waitForPageToLoad 5000 @@ -886,7 +866,12 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form @@ -900,7 +885,7 @@ - pause + waitForPageToLoad 5000 @@ -946,7 +931,12 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form @@ -960,7 +950,7 @@ - pause + waitForPageToLoad 5000 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html index 62dbe060..57e91874 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html @@ -135,13 +135,13 @@ - assertTitle - Johnson, Jane + clickAndWait + link=Edit this individual - clickAndWait - link=Edit this individual + assertTitle + Johnson, Jane @@ -151,7 +151,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -221,7 +221,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -291,7 +291,7 @@ clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html index 9806f5d8..b94afad4 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html @@ -159,9 +159,14 @@ Individual Control Panel + + comment + Delete faculty member + + clickAndWait - //input[@value='Edit This Individual'] + //input[@value="Edit This Individual's Datatype Properties"] @@ -169,11 +174,6 @@ Individual Editing Form - - comment - Delete faculty member - - click _delete diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index d4435feb..592f0dbd 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -154,9 +154,14 @@ title Dr. + + select + positionType + label=Faculty Position + type - startField.year + startField-year 2010 @@ -189,9 +194,14 @@ title Ms. + + select + positionType + label=Faculty Position + type - startField.year + startField-year 2009 @@ -224,9 +234,14 @@ title Dr. + + select + positionType + label=Faculty Position + type - startField.year + startField-year 2008 @@ -259,9 +274,14 @@ title Mrs. + + select + positionType + label=Faculty Position + type - startField.year + startField-year 2007 @@ -326,7 +346,7 @@ verifyTextPresent - Who do you want to compare? + What do you want to compare? @@ -349,11 +369,6 @@ 4 - - verifyTextPresent - Agent, Faculty Member - - verifyTextPresent Zink, Zoe @@ -364,11 +379,6 @@ 1 - - verifyTextPresent - Agent - - verifyTextPresent Smith, Sally @@ -379,11 +389,6 @@ 1 - - verifyTextPresent - Agent - - verifyTextPresent Johnson, Jane @@ -394,11 +399,6 @@ 1 - - verifyTextPresent - Agent - - verifyTextPresent Comparing Publications of People in Child Development @@ -454,11 +454,6 @@ 2010 - - verifyTextPresent - 2011 - - verifyTextPresent Year @@ -471,7 +466,7 @@ verifyTextPresent - You have selected 4 of a maximum 10 people. + You have selected 3 of a maximum 10 people. @@ -506,22 +501,22 @@ click - //input[@value='Furter, Frank'] + css=input.entity-selector-checkbox click - //input[@value='Smith, Sally'] + //input[@value='http://vivo.mydomain.edu/individual/n4285'] click - //input[@value='Zink, Zoe'] + //input[@value='http://vivo.mydomain.edu/individual/n4758'] click - //input[@value='Johnson, Jane'] + //input[@value='http://vivo.mydomain.edu/individual/n7915'] @@ -576,12 +571,12 @@ verifyTextPresent - Who do you want to compare? + What do you want to compare? verifyTextPresent - Records 1 - 3 of 3 + Records 1 - 4 of 4 @@ -596,7 +591,7 @@ verifyTextPresent - Agent, Faculty Member + Faculty Member @@ -609,11 +604,6 @@ 2 - - verifyTextPresent - Agent - - verifyTextPresent Johnson, Jane @@ -626,7 +616,12 @@ verifyTextPresent - Agent + Smith, Sally + + + + verifyTextPresent + 0 @@ -679,11 +674,6 @@ 2010 - - verifyTextPresent - 2011 - - verifyTextPresent Year @@ -696,7 +686,7 @@ verifyTextPresent - You have selected 3 of a maximum 10 people. + You have selected 4 of a maximum 10 people. @@ -714,6 +704,11 @@ link=Zink, Zoe + + verifyElementPresent + link=Smith, Sally + + click link=Clear @@ -739,6 +734,11 @@ link=Zink, Zoe + + verifyElementNotPresent + link=Smith, Sally + + comment Make dept sub-org of a college @@ -871,7 +871,7 @@ verifyTextPresent - Who do you want to compare? + What do you want to compare? @@ -886,7 +886,7 @@ verifyTextPresent - Agent, Department + Department @@ -944,11 +944,6 @@ 2010 - - verifyTextPresent - 2011 - - verifyTextPresent Year @@ -1011,7 +1006,7 @@ verifyTextPresent - Who do you want to compare? + What do you want to compare? @@ -1031,7 +1026,7 @@ verifyTextPresent - Agent, Department + Department @@ -1084,11 +1079,6 @@ 2010 - - verifyTextPresent - 2011 - - verifyTextPresent Year