diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html b/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html index 9e4e1e12..929d35a8 100644 --- a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html @@ -93,7 +93,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy @@ -111,6 +111,16 @@ Publication Type + + verifyTextPresent + Title + + + + verifyTextPresent + Publication Date + + select id=typeSelector @@ -353,9 +363,14 @@ + + selectWindow + null + + clickAndWait - css=a.add-relatedBy + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -558,16 +573,6 @@ Edit - - type - id=object - Alco - - - click - id=ui-active-menuitem - - clickAndWait id=submit @@ -607,7 +612,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -869,7 +874,7 @@ clickAndWait - css=a.add-relatedBy + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -1180,36 +1185,16 @@ Furter, Frank - Map of Science Visualization - - click - name=view-type - - - - click - id=first-filter - - - - waitForTextPresent - Explore activity - - - - assertTitle - Furter, Frank - Map of Science Visualization - - - - pause - 10000 - - verifyTextPresent Furter, Frank + + verifyElementPresent + id=entityMoniker + + verifyTextPresent Explore activity (4 publications) across 554 scientific subdisciplines @@ -1225,6 +1210,16 @@ 13 Disciplines + + verifyElementPresent + id=second-filter + + + + verifyTextPresent + Search: + + verifyTextPresent Neurotoxicology diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications2.html b/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications2.html index e74b5da5..6844e37b 100644 --- a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications2.html +++ b/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications2.html @@ -114,7 +114,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html index 063aa5f4..8864dce4 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html @@ -119,8 +119,8 @@ select - Namespace - label=VIVO core + name=Namespace + label=VIVO Core type @@ -129,8 +129,8 @@ select - DomainClassURI - label=foaf:Agent + name=DomainClassURI + label=Agent (foaf) select @@ -150,22 +150,27 @@ verifyTextPresent - exact:vivo:architecturalDetails + Data Property Control Panel verifyTextPresent - VIVO core + architectural details (vivo) verifyTextPresent - architectural details + Place - verifyElementPresent - link=exact:http://xmlns.com/foaf/0.1/Agent + verifyTextPresent + VIVO Core + + + + verifyTextPresent + architecturalDetails @@ -175,7 +180,7 @@ verifyTextPresent - Place + false @@ -188,6 +193,21 @@ public + + verifyTextPresent + -1 + + + + verifyTextPresent + (unspecified) + + + + verifyTextPresent + http://vivoweb.org/ontology/core#architecturalDetails + + clickAndWait @@ -211,12 +231,12 @@ verifyElementPresent - link=architectural details + link=architectural details (vivo) verifyTextPresent - vivo:architecturalDetails + architectural details (vivo) @@ -226,7 +246,7 @@ verifyTextPresent - foaf:Agent + Agent (foaf) @@ -236,7 +256,7 @@ clickAndWait - link=architectural details + link=architectural details (vivo) @@ -246,7 +266,7 @@ verifyTextPresent - vivo:architecturalDetails + architectural details (vivo) @@ -261,7 +281,7 @@ verifyTextPresent - VIVO core + VIVO Core @@ -271,7 +291,7 @@ verifyElementPresent - link=exact:http://xmlns.com/foaf/0.1/Agent + link=Agent (foaf) diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html index c4cafb25..bb693e0b 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html @@ -96,6 +96,11 @@ + + click + //div[@id='wrapper-content']/ul/li[16] + + clickAndWait //h3[@id='visitingHours']/a/img diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html index 98f5e0d0..c314572c 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html @@ -97,11 +97,6 @@ - - selectWindow - null - - select name=ParentURI diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html index 41e7f33b..99be0739 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html @@ -80,15 +80,20 @@ VIVO + + assertTitle + VIVO + + verifyElementPresent - link=architectural details + link=architectural details (vivo) clickAndWait - link=architectural details + link=architectural details (vivo) @@ -119,7 +124,7 @@ waitForPageToLoad - 5000 + 10000 @@ -129,7 +134,7 @@ verifyElementNotPresent - link=architectural details + link=architectural details (vivo) diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html index 46d450c3..5f061436 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html @@ -59,14 +59,9 @@ loginForm - - clickAndWait - link=Site Admin - - assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html index e696a718..58ee4708 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html @@ -83,13 +83,13 @@ verifyElementPresent - link=visiting hours + link=visiting hours (bibo) clickAndWait - link=visiting hours + link=visiting hours (bibo) @@ -120,7 +120,7 @@ waitForPageToLoad - 5000 + 10000 @@ -131,7 +131,7 @@ verifyTextNotPresent - visiting hours + visiting hours (bibo) diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html index 178943d2..cbb9ec91 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html @@ -94,7 +94,7 @@ assertTitle - Classgroup Editing Form + Property Group Editing Form @@ -110,7 +110,7 @@ waitForPageToLoad - 5000 + 10000 diff --git a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html index c7d629f6..94e096ea 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html @@ -104,14 +104,9 @@ select - HiddenFromDisplayBelowRoleLevelUsingRoleUri + name=HiddenFromDisplayBelowRoleLevelUsingRoleUri label=public - - type - DomainDisplayTier - 1000 - clickAndWait primaryAction @@ -123,11 +118,6 @@ - - verifyTextPresent - property: 1000, inverse: -1 - - verifyTextPresent public diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html index db6af492..f312f9f7 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html @@ -11,452 +11,462 @@ AddPositions - - - deleteAllVisibleCookies - - - - - setTimeout - 100000 - - - - open - /vivo/ - - - - assertTitle - VIVO - - - - - clickAndWait - link=Log in - - - - assertTitle - Log in to VIVO - - - - - type - loginName - testAdmin@cornell.edu - - - type - loginPassword - Password - - - clickAndWait - loginForm - - - - - clickAndWait - link=Index - - - - clickAndWait - link=Faculty Member - - - - assertTitle - Faculty Member - - - - clickAndWait - link=Faculty, Jane - - - - assertTitle - Faculty, Jane - - - - - click - //div[@id='wrapper-content']/ul/li[8] - - - - clickAndWait - xpath=(//img[@alt='add'])[23] - - - - assertTitle - Edit - - - - verifyTextPresent - Create advisor relationship entry for Faculty, Jane - - - - verifyTextPresent - Advising Relationship Type - - - - verifyTextPresent - Advisee: Last name - - - - verifyTextPresent - First name - - - - verifyTextPresent - Subject Area - - - - verifyTextPresent - Degree Candidacy - - - - verifyTextPresent - Years of Participation - - - - verifyTextPresent - Start Year - - - - verifyTextPresent - End Year - - - - - clickAndWait - link=Cancel - - - - clickAndWait - xpath=(//img[@alt='add'])[23] - - - - assertTitle - Edit - - - - - select - id=selector - label=Undergraduate Advising Relationship - - - clickAndWait - css=input.submit - - - - assertTitle - Edit - - - - verifyTextPresent - You must enter a value in the Last Name field. - - - - verifyTextPresent - You must enter a value in the First Name field. - - - - - select - id=selector - label=Undergraduate Advising Relationship - - - type - id=advisee - Smith - - - clickAndWait - css=input.submit - - - - assertTitle - Edit - - - - verifyTextPresent - You must enter a value in the First Name field. - - - - - select - id=selector - label=Undergraduate Advising Relationship - - - type - id=advisee - - - - type - id=firstName - Joe - - - clickAndWait - css=input.submit - - - - verifyTextPresent - You must enter a value in the Last Name field. - - - - - select - id=selector - label=Undergraduate Advising Relationship - - - type - id=advisee - Smith - - - type - id=firstName - Joe - - - clickAndWait - css=input.submit - - - - - verifyTextPresent - undergraduate advising relationship - - - - verifyElementPresent - link=Smith, Joe - - - - - clickAndWait - xpath=(//img[@alt='add'])[23] - - - - assertTitle - Edit - - - - select - id=selector - label=Graduate Advising Relationship - - - type - id=advisee - Doe - - - type - id=firstName - John - - - type - id=SubjectArea - Primates - - - select - id=degreeUri - label=M.S. Master of Science - - - type - id=startField-year - 2008 - - - type - id=endField-year - 2011 - - - clickAndWait - css=input.submit - - - - assertTitle - Faculty, Jane - - - - - verifyTextPresent - undergraduate advising relationship - - - - verifyElementPresent - link=Smith, Joe - - - - verifyTextPresent - graduate advising relationship - - - - verifyTextPresent - Doe, John, M.S.  candidate, 2008 - 2011 - - - - verifyElementPresent - link=Doe, John - - - - - clickAndWait - xpath=(//img[@alt='add'])[23] - - - - assertTitle - Edit - - - - select - id=selector - label=Faculty Mentoring Relationship - - - type - id=advisee - Adams - - - type - id=firstName - Jeff - - - type - id=SubjectArea - Primate Health - - - type - id=startField-year - 2012 - - - clickAndWait - css=input.submit - - - - assertTitle - Faculty, Jane - - - - - verifyTextPresent - undergraduate advising relationship - - - - verifyElementPresent - link=Smith, Joe - - - - verifyTextPresent - graduate advising relationship - - - - verifyTextPresent - Doe, John, M.S.  candidate, 2008 - 2011 - - - - verifyElementPresent - link=Doe, John - - - - verifyTextPresent - faculty mentoring relationship - - - - verifyTextPresent - Adams, Jeff, 2012 - - - - - verifyElementPresent - link=Adams, Jeff - - - - - clickAndWait - link=Home - - - - clickAndWait - link=Log out - - - - assertTitle - VIVO - - + + + deleteAllVisibleCookies + + + + + setTimeout + 100000 + + + + open + /vivo/ + + + + assertTitle + VIVO + + + + + clickAndWait + link=Log in + + + + assertTitle + Log in to VIVO + + + + + type + loginName + testAdmin@cornell.edu + + + type + loginPassword + Password + + + clickAndWait + loginForm + + + + + clickAndWait + link=Index + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Faculty, Jane + + + + assertTitle + Faculty, Jane + + + + + click + //div[@id='wrapper-content']/ul/li[8] + + + + selectWindow + null + + + + clickAndWait + xpath=(//img[@alt='add'])[24] + + + + assertTitle + Edit + + + + verifyTextPresent + Create advisor relationship entry for Faculty, Jane + + + + verifyTextPresent + Advising Relationship Type + + + + verifyTextPresent + Advisee: Last name + + + + verifyTextPresent + First name + + + + verifyTextPresent + Subject Area + + + + verifyTextPresent + Degree Candidacy + + + + verifyTextPresent + Years of Participation + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + + + + clickAndWait + link=Cancel + + + + clickAndWait + xpath=(//img[@alt='add'])[24] + + + + assertTitle + Edit + + + + + select + id=selector + label=Undergraduate Advising Relationship + + + clickAndWait + css=input.submit + + + + assertTitle + Edit + + + + verifyTextPresent + You must enter a value in the Last Name field. + + + + verifyTextPresent + You must enter a value in the First Name field. + + + + + select + id=selector + label=Undergraduate Advising Relationship + + + type + id=advisee + Smith + + + clickAndWait + css=input.submit + + + + assertTitle + Edit + + + + verifyTextPresent + You must enter a value in the First Name field. + + + + + select + id=selector + label=Undergraduate Advising Relationship + + + type + id=advisee + + + + type + id=firstName + Joe + + + clickAndWait + css=input.submit + + + + verifyTextPresent + You must enter a value in the Last Name field. + + + + + select + id=selector + label=Undergraduate Advising Relationship + + + type + id=advisee + Smith + + + type + id=firstName + Joe + + + clickAndWait + css=input.submit + + + + + verifyTextPresent + undergraduate advising relationship + + + + verifyElementPresent + link=Smith, Joe + + + + + clickAndWait + xpath=(//img[@alt='add'])[24] + + + + assertTitle + Edit + + + + select + id=selector + label=Graduate Advising Relationship + + + type + id=advisee + Doe + + + type + id=firstName + John + + + type + id=SubjectArea + Primates + + + select + id=degreeUri + label=M.S. Master of Science + + + type + id=startField-year + 2008 + + + type + id=endField-year + 2011 + + + clickAndWait + css=input.submit + + + + assertTitle + Faculty, Jane + + + + + verifyTextPresent + undergraduate advising relationship + + + + verifyElementPresent + link=Smith, Joe + + + + verifyTextPresent + graduate advising relationship + + + + verifyTextPresent + Doe, John, M.S.  candidate, 2008 - 2011 + + + + verifyElementPresent + link=Doe, John + + + + + clickAndWait + xpath=(//img[@alt='add'])[24] + + + + assertTitle + Edit + + + + select + id=selector + label=Faculty Mentoring Relationship + + + type + id=advisee + Adams + + + type + id=firstName + Jeff + + + type + id=SubjectArea + Primate Health + + + type + id=startField-year + 2012 + + + clickAndWait + css=input.submit + + + + assertTitle + Faculty, Jane + + + + + verifyTextPresent + faculty mentoring relationship + + + + verifyTextPresent + Adams, Jeff, 2012 - + + + + verifyElementPresent + link=Adams, Jeff + + + + verifyTextPresent + graduate advising relationship + + + + verifyTextPresent + Doe, John, M.S.  candidate, 2008 - 2011 + + + + verifyElementPresent + link=Doe, John + + + + verifyTextPresent + undergraduate advising relationship + + + + verifyTextPresent + Smith, Joe + + + + verifyElementPresent + link=Smith, Joe + + + + + clickAndWait + link=Home + + + + clickAndWait + link=Log out + + + + assertTitle + VIVO + + diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html index 032aad5b..a72aba11 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html @@ -121,6 +121,11 @@ undergraduate advising relationship + + verifyTextPresent + Smith, Joe + + verifyElementPresent link=Smith, Joe @@ -129,7 +134,7 @@ clickAndWait - css=a.edit-advisorIn > img.edit-individual + css=a.edit-RO_0000053 > img.edit-individual @@ -193,6 +198,11 @@ undergraduate advising relationship + + verifyTextPresent + Smith, Joe + + verifyElementPresent link=Smith, Joe @@ -201,7 +211,7 @@ clickAndWait - xpath=(//img[@alt='edit'])[4] + xpath=(//img[@alt='edit this entry'])[3] @@ -270,6 +280,11 @@ undergraduate advising relationship + + verifyTextPresent + Smith, Joe + + verifyElementPresent link=Smith, Joe @@ -278,7 +293,7 @@ clickAndWait - xpath=(//img[@alt='edit'])[5] + xpath=(//img[@alt='edit this entry'])[4] diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteAdvises.html index 9228d368..016751f3 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteAdvises.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteAdvises.html @@ -88,7 +88,7 @@ clickAndWait - css=a.delete-advisorIn > img.delete-individual + css=a.delete-RO_0000053 > img.delete-individual @@ -108,7 +108,7 @@ clickAndWait - css=a.delete-advisorIn > img.delete-individual + css=a.delete-RO_0000053 > img.delete-individual @@ -128,7 +128,7 @@ clickAndWait - css=a.delete-advisorIn > img.delete-individual + css=a.delete-RO_0000053 > img.delete-individual diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/SearchAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/SearchAdvises.html index 3b4e3c15..253483e0 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/SearchAdvises.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/SearchAdvises.html @@ -48,11 +48,6 @@ Search results for 'advises' - - verifyElementPresent - link=people - - verifyElementPresent link=research @@ -68,26 +63,6 @@ link=Primate Health - - verifyElementPresent - link=Faculty, Jane - - - - verifyElementPresent - link=Adams, Jeff - - - - verifyElementPresent - link=Smith, Joe - - - - verifyElementPresent - link=Doe, John - - type diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html index 02f4d4da..ab30a9b1 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html @@ -93,7 +93,7 @@ clickAndWait - xpath=(//img[@alt='add'])[33] + xpath=(//img[@alt='add'])[34] @@ -120,7 +120,7 @@ clickAndWait - xpath=(//img[@alt='add'])[33] + xpath=(//img[@alt='add'])[34] @@ -198,7 +198,7 @@ clickAndWait - xpath=(//img[@alt='add'])[33] + xpath=(//img[@alt='add'])[34] @@ -280,7 +280,7 @@ clickAndWait - xpath=(//img[@alt='add'])[33] + xpath=(//img[@alt='add'])[34] @@ -405,6 +405,11 @@ Best Professor + + click + //div[@id='wrapper-content']/ul/li[6] + + verifyElementPresent link=Carroll College diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html index 1221a34a..8b87c169 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html @@ -86,6 +86,11 @@ + + click + //div[@id='wrapper-content']/ul/li[20] + + verifyTextPresent Best Professor, conferred by Carroll College, 2012 @@ -134,7 +139,7 @@ clickAndWait - css=a.edit-awardOrHonor > img.edit-individual + css=a.edit-relatedBy > img.edit-individual @@ -206,7 +211,7 @@ clickAndWait - xpath=(//img[@alt='edit'])[4] + xpath=(//img[@alt='edit this entry'])[3] @@ -288,7 +293,7 @@ clickAndWait - css=a.edit-awardOrHonor > img.edit-individual + css=a.edit-relatedBy > img.edit-individual diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html b/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html index c549f9cc..4703a703 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html @@ -35,6 +35,26 @@ + + verifyTextPresent + Faculty Member (1) + + + + verifyElementPresent + link=Faculty Member + + + + verifyTextPresent + Person (1) + + + + verifyElementPresent + link=Person + + verifyTextPresent organizations diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html index 4dc84355..eff6d80b 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html @@ -11,26 +11,6 @@ CreateTestFacultyMember - - selectWindow - null - - - - clickAndWait - css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual - - - - assertTitle - Edit - - - - assertTitle - Faculty, Jane - - deleteAllVisibleCookies diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html index be0fa80a..1ed87cfa 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html @@ -86,9 +86,14 @@ + + click + //div[@id='wrapper-content']/ul/li[20] + + clickAndWait - css=a.delete-awardOrHonor > img.delete-individual + css=a.delete-relatedBy > img.delete-individual @@ -108,7 +113,7 @@ clickAndWait - css=a.delete-awardOrHonor > img.delete-individual + css=a.delete-relatedBy > img.delete-individual @@ -128,7 +133,7 @@ clickAndWait - css=a.delete-awardOrHonor > img.delete-individual + css=a.delete-relatedBy > img.delete-individual diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html index 95ecba64..1b3891e5 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html @@ -53,11 +53,6 @@ link=people - - verifyElementPresent - link=organizations - - verifyElementPresent link=research @@ -83,16 +78,6 @@ link=Best Professor - - verifyTextPresent - Carroll College Organization - - - - verifyElementPresent - link=Carroll College - - verifyTextPresent Faculty, Jane Assistant Professor @@ -124,11 +109,6 @@ Search results for 'primate' - - verifyElementPresent - link=people - - verifyElementPresent link=organizations @@ -159,16 +139,6 @@ link=Primates-R-Us - - verifyTextPresent - Faculty, Jane Assistant Professor - - - - verifyElementPresent - link=Faculty, Jane - - clickAndWait diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CheckIndexView.html b/utilities/acceptance-tests/suites/CustomEducationForm/CheckIndexView.html index 382b849d..4c77cab2 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/CheckIndexView.html @@ -35,11 +35,6 @@ - - verifyElementPresent - link=College - - verifyTextPresent College (1) @@ -47,7 +42,7 @@ verifyElementPresent - link=Organization + link=College @@ -57,7 +52,7 @@ verifyElementPresent - link=University + link=Organization @@ -65,6 +60,11 @@ University (2) + + verifyElementPresent + link=University + + clickAndWait diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html index bc50fdfe..f197075e 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html @@ -80,6 +80,21 @@ B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + + verifyElementPresent + link=University of Wisconsin + + + + verifyElementPresent + link=Carroll University + + + + verifyElementPresent + link=Carroll College + + clickAndWait diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html index fa0077d0..a938974d 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html @@ -49,12 +49,12 @@ verifyTextPresent - Carroll College College + Search results for 'carroll' verifyElementPresent - link=Carroll College + link=organizations @@ -67,9 +67,14 @@ link=Carroll University + + verifyTextPresent + Carroll College College + + verifyElementPresent - link=Faculty, Jane + link=Carroll College @@ -89,12 +94,17 @@ verifyTextPresent - University of Wisconsin University + Search results for 'wisconsin' verifyElementPresent - link=University of Wisconsin + link=organizations + + + + verifyElementPresent + link=locations @@ -107,9 +117,24 @@ link=Wisconsin + + verifyTextPresent + University of Wisconsin University + + verifyElementPresent - link=Faculty, Jane + link=University of Wisconsin + + + + verifyTextPresent + United States of America Country + + + + verifyElementPresent + link=United States of America diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html index 49c7acc4..9f9c4006 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html @@ -106,6 +106,31 @@ Organization Type + + verifyTextPresent + Organization Name + + + + verifyTextPresent + Position Title + + + + verifyTextPresent + Position Type + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + clickAndWait @@ -122,6 +147,41 @@ Edit + + verifyTextPresent + Create position entry for Faculty, Jane + + + + verifyTextPresent + Organization Type + + + + verifyTextPresent + Organization Name + + + + verifyTextPresent + Position Title + + + + verifyTextPresent + Position Type + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + select @@ -335,6 +395,21 @@ Assistant Professor, Carroll University 1981 - 1985 + + verifyElementPresent + link=Carroll College + + + + verifyElementPresent + link=Cornell University + + + + verifyElementPresent + link=Carroll University + + clickAndWait diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html index 72548bea..b5ad45b8 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html @@ -101,6 +101,21 @@ Assistant Professor, Carroll University 1981 - 1985 + + verifyElementPresent + link=Carroll College + + + + verifyElementPresent + link=Cornell University + + + + verifyElementPresent + link=Carroll University + + clickAndWait @@ -312,6 +327,21 @@ Lecturer, Carroll College 1977 - 1981 + + verifyElementPresent + link=Cornell University + + + + verifyElementPresent + link=Carroll University + + + + verifyElementPresent + link=Carroll College + + clickAndWait diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html index 84dd0220..20ef8d54 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html @@ -75,6 +75,21 @@ Lecturer, Carroll College 1977 - 1981 + + verifyElementPresent + link=Cornell University + + + + verifyElementPresent + link=Carroll University + + + + verifyElementPresent + link=Carroll College + + clickAndWait diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html index aaf04970..0cc0e7a7 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html @@ -88,7 +88,7 @@ clickAndWait - css=a.delete-personInPosition > img.delete-individual + css=a.delete-relatedBy > img.delete-individual @@ -98,7 +98,7 @@ clickAndWait - submit + id=submit @@ -108,7 +108,7 @@ clickAndWait - css=a.delete-personInPosition > img.delete-individual + css=a.delete-relatedBy > img.delete-individual @@ -118,7 +118,7 @@ clickAndWait - submit + id=submit @@ -128,7 +128,7 @@ clickAndWait - css=a.delete-personInPosition > img.delete-individual + css=a.delete-relatedBy > img.delete-individual @@ -138,7 +138,7 @@ clickAndWait - submit + id=submit diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html index 6d6cdddd..07fea3c1 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html @@ -40,42 +40,17 @@ assertTitle - lecturer - VIVO Search Results + Search for 'lecturer' verifyTextPresent - Search results for 'lecturer' - - - - verifyElementPresent - link=people - - - - verifyElementPresent - link=organizations - - - - verifyElementPresent - link=Carroll College + Search for 'lecturer' verifyTextPresent - College - - - - verifyElementPresent - link=Faculty, Jane - - - - verifyTextPresent - Assistant Professor + No matching results. @@ -105,8 +80,8 @@ - verifyElementPresent - link=organizations + verifyTextPresent + Faculty, Jane Assistant Professor @@ -114,31 +89,6 @@ link=Faculty, Jane - - verifyTextPresent - Assistant Professor - - - - verifyElementPresent - link=Carroll University - - - - verifyTextPresent - University - - - - verifyElementPresent - link=Cornell University - - - - verifyTextPresent - University - - type @@ -162,12 +112,12 @@ verifyElementPresent - link=people + link=organizations - verifyElementPresent - link=organizations + verifyTextPresent + Carroll College College @@ -177,7 +127,7 @@ verifyTextPresent - College + Carroll University University @@ -185,21 +135,6 @@ link=Carroll University - - verifyTextPresent - University - - - - verifyElementPresent - link=Faculty, Jane - - - - verifyTextPresent - Assistant Professor - - clickAndWait @@ -244,12 +179,12 @@ verifyElementPresent - link=people + link=organizations - verifyElementPresent - link=organizations + verifyTextPresent + Carroll University University @@ -259,7 +194,7 @@ verifyTextPresent - University + Cornell University University @@ -267,11 +202,6 @@ link=Carroll University - - verifyTextPresent - University - - clickAndWait @@ -329,13 +259,13 @@ - verifyElementPresent - link=Faculty, Jane + verifyTextPresent + Faculty, Jane , Professor 1986 - - verifyTextPresent - Faculty, Jane, Professor 1986 - + verifyElementPresent + link=Faculty, Jane diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index 3e0a91e6..370496bd 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html @@ -303,12 +303,12 @@ verifyTextPresent - Version rel-1.6-rc1 + Version rel-1.6-rc2 verifyElementPresent - link=rel-1.6-rc1 + link=rel-1.6-rc2 @@ -532,7 +532,7 @@ verifyTextPresent - Version rel-1.6-rc1 + Version rel-1.6-rc2 @@ -639,12 +639,12 @@ verifyTextPresent - Version rel-1.6-rc1 + Version rel-1.6-rc2 verifyElementPresent - link=rel-1.6-rc1 + link=rel-1.6-rc2 diff --git a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html index a79ab8fe..032f4c70 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html +++ b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html @@ -890,7 +890,7 @@ verifyElementPresent - link=northern America + link=North America diff --git a/utilities/acceptance-tests/suites/OntologyManagement/RebuildSearchIndex.html b/utilities/acceptance-tests/suites/OntologyManagement/RebuildSearchIndex.html index 65a1371d..4ff332de 100644 --- a/utilities/acceptance-tests/suites/OntologyManagement/RebuildSearchIndex.html +++ b/utilities/acceptance-tests/suites/OntologyManagement/RebuildSearchIndex.html @@ -88,13 +88,13 @@ - assertTitle - Rebuild Search Index + waitForTextPresent + Reset the search index and re-populate it. - waitForTextPresent - Reset the search index and re-populate it. + assertTitle + Rebuild Search Index diff --git a/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html b/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html index bfb5209c..0052111b 100644 --- a/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html +++ b/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html @@ -160,6 +160,16 @@ + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + type name=querytext @@ -252,6 +262,16 @@ + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + type name=querytext