diff --git a/.gitignore b/.gitignore index d5374069..309fa722 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /runtime.properties /ontology/public/catalog-v0001.xml +rdf/auth/firsttime/test-user-model.owl diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html index eaf0ab5e..3a2236dc 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html @@ -80,6 +80,11 @@ User accounts + + verifyTextPresent + 5 accounts + + clickAndWait //input[@value='Add new account'] @@ -161,6 +166,11 @@ 10000 + + verifyTextPresent + 6 accounts + + verifyElementPresent link=RickRookie@cornell.edu diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html index 181057c8..2796ad99 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html @@ -98,7 +98,7 @@ assertConfirmation - Are you sure you want to delete this account? + Are you sure you want to delete this account?? diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html index 356432b6..b1d4196e 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html @@ -98,7 +98,7 @@ assertConfirmation - Are you sure you want to delete this account? + Are you sure you want to delete this account?? diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html index bfc8e31d..35f5b031 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html @@ -98,7 +98,7 @@ assertConfirmation - Are you sure you want to delete this account? + Are you sure you want to delete this account?? diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html index 3776efcd..9edb99bf 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html @@ -32,7 +32,6 @@ VIVO - clickAndWait link=Log in @@ -43,6 +42,7 @@ Log in to VIVO + type diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html index 2eef3f91..e9375cd4 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html +++ b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html @@ -109,7 +109,7 @@ assertTitle - Classgroup Editing Form + VIVO diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html index 79d5a32c..0da8f2c2 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html +++ b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html @@ -83,13 +83,13 @@ verifyElementPresent - link=vivo:Hours + link=Hours clickAndWait - link=vivo:Hours + link=Hours @@ -107,6 +107,11 @@ Individuals in Class Hours + + verifyTextPresent + No individuals to display + + verifyTextNotPresent @@ -147,12 +152,12 @@ verifyElementPresent - link=vivo:Hours + link=Hours clickAndWait - link=vivo:Hours + link=Hours @@ -171,8 +176,8 @@ - verifyTextPresent - Daytime hours + verifyElementPresent + link=Daytime hours diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html index 68d5d665..3aa01db7 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html +++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html @@ -117,11 +117,6 @@ GroupURI label=Times - - select - Namespace - label=VIVO core - type LocalName @@ -140,7 +135,7 @@ verifyTextPresent - vivo:Hours + Hours @@ -148,6 +143,16 @@ Times + + verifyTextPresent + (not identified) + + + + verifyTextPresent + hours + + verifyTextPresent site administrator @@ -155,7 +160,17 @@ verifyTextPresent - exact:http://vivoweb.org/ontology/core#hours + -1 + + + + verifyTextPresent + (unspecified) + + + + verifyTextPresent + http://vivo.mydomain.edu/individual/hours @@ -170,7 +185,17 @@ verifyElementPresent - link=vivo:Hours + link=Hours + + + + verifyTextPresent + Times + + + + verifyTextPresent + http://vivo.mydomain.edu/individual/ diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html index 8eeb7056..2dc4b72b 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html +++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html @@ -117,11 +117,6 @@ GroupURI label=Times - - select - Namespace - label=VIVO core - type LocalName @@ -140,7 +135,7 @@ verifyTextPresent - vivo:Minutes + Minutes @@ -148,6 +143,16 @@ Times + + verifyTextPresent + (not identified) + + + + verifyTextPresent + minutes + + verifyTextPresent editor, curator, site administrator @@ -155,7 +160,17 @@ verifyTextPresent - exact:http://vivoweb.org/ontology/core#minutes + -1 + + + + verifyTextPresent + (unspecified) + + + + verifyTextPresent + http://vivo.mydomain.edu/individual/minutes @@ -170,7 +185,17 @@ verifyElementPresent - link=vivo:Minutes + link=Minutes + + + + verifyTextPresent + Times + + + + verifyTextPresent + http://vivo.mydomain.edu/individual/ diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html index f434cbaa..8cd2ad58 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html +++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html @@ -83,7 +83,7 @@ clickAndWait - link=vivo:Hours + link=Hours @@ -162,7 +162,7 @@ clickAndWait - link=vivo:Hours + link=Hours @@ -180,6 +180,11 @@ Individuals in Class Hours + + verifyTextPresent + No individuals to display + + verifyTextNotPresent Daytime hours diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html index 86ef222e..f9459124 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html +++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html @@ -83,13 +83,13 @@ verifyElementPresent - link=vivo:Hours + link=Hours clickAndWait - link=vivo:Hours + link=Hours @@ -131,7 +131,7 @@ verifyElementNotPresent - link=vivo:Hours + link=Hours diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html index 1136a604..29a555e4 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html +++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html @@ -83,13 +83,13 @@ verifyElementPresent - link=vivo:Minutes + link=Minutes clickAndWait - link=vivo:Minutes + link=Minutes @@ -131,7 +131,7 @@ verifyElementNotPresent - link=vivo:Minutes + link=Minutes diff --git a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html index afc16f48..70afeb39 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html +++ b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html @@ -82,8 +82,8 @@ - verifyTextPresent - exact:vivo:Hours + verifyElementPresent + link=Hours @@ -103,13 +103,13 @@ verifyTextPresent - VIVO core + http://vivo.mydomain.edu/individual/ clickAndWait - link=vivo:Hours + link=Hours @@ -130,7 +130,7 @@ verifyElementPresent - link=exact:vivo:Hours + link=Hours @@ -150,12 +150,12 @@ verifyTextPresent - VIVO core + http://vivo.mydomain.edu/individual/ clickAndWait - link=exact:vivo:Hours + link=Hours @@ -163,26 +163,6 @@ Class Control Panel - - clickAndWait - link=Site Admin - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Class groups - - - - assertTitle - VIVO - - clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html index 470763ef..45c45df6 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html @@ -111,9 +111,14 @@ + + selectWindow + null + + clickAndWait - css=a.add-preferredTitle > img.add-individual + css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual @@ -121,14 +126,9 @@ Edit - - waitForElementPresent - tinymce - - type - tinymce + id=preferredTitle Assistant Professor diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html index a166d53d..98f5e0d0 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html @@ -98,73 +98,78 @@ - select - ParentURI - label=dateTimeInterval (vivo) + selectWindow + null + select - GroupURI + name=ParentURI + label=date/time interval (vivo) + + + select + name=GroupURI label=Place select - HiddenFromDisplayBelowRoleLevelUsingRoleUri - label=editor, curator, site administrator - - - select - ProhibitedFromUpdateBelowRoleLevelUsingRoleUri - label=site administrator - - - select - Namespace + name=Namespace label=Bibontology type - LocalName + name=LocalName visitingHours type - DomainPublic + name=DomainPublic visiting hours select - NamespaceInverse + name=NamespaceInverse label=Bibontology - - select - DomainVClassURI - label=vivo:Museum - type - LocalNameInverse + name=LocalNameInverse visitingHoursFor type - RangePublic + name=RangePublic visiting hours for select - RangeVClassURI - label=vivo:Date/Time Interval + name=DomainVClassURI + label=Museum (vivo) + + + select + name=RangeVClassURI + label=Date/Time Interval (vivo) + + + select + name=HiddenFromDisplayBelowRoleLevelUsingRoleUri + label=editor, curator, site administrator + + + select + name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri + label=site administrator type - DomainDisplayTier + name=DomainDisplayTier 100 click - OfferCreateNewOption + name=OfferCreateNewOption @@ -180,12 +185,12 @@ verifyTextPresent - bibo:visitingHours + visiting hours (bibo) verifyElementPresent - link=exact:vivo:dateTimeInterval + link=date/time interval (vivo) @@ -204,13 +209,18 @@ - verifyElementPresent - link=exact:vivo:Museum + verifyTextPresent + visiting hours verifyElementPresent - link=exact:vivo:Date/Time Interval + link=Museum (vivo) + + + + verifyElementPresent + link=Date/Time Interval (vivo) diff --git a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html index 2e8fb188..5339884f 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html +++ b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html @@ -88,7 +88,7 @@ assertTitle - Classgroup Editing Form + Property Group Editing Form @@ -108,9 +108,19 @@ + + verifyElementPresent + link=Place + + verifyTextPresent - Place + Display Rank: + + + + verifyTextPresent + 2 diff --git a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html index b20ee4e6..c7d629f6 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html @@ -83,7 +83,7 @@ clickAndWait - link=visiting hours + link=visiting hours (bibo) diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html index 8163eb03..db6af492 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html @@ -1,457 +1,462 @@ - - - - - - -AddPositions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AddPositions
deleteAllVisibleCookies
setTimeout100000
open/vivo/
assertTitleVIVO
clickAndWaitlink=Log in
assertTitleLog in to VIVO
typeloginNametestAdmin@cornell.edu
typeloginPasswordPassword
clickAndWaitloginForm
clickAndWaitlink=Index
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
clickAndWaitcss=a.add-advisorIn > img.add-individual
assertTitleEdit
verifyTextPresentCreate advising relationship entry for Faculty, Jane
verifyTextPresentAdvising Relationship Type
verifyTextPresentAdvisee: Last Name
verifyTextPresentFirst Name
verifyTextPresentSubject Area
verifyTextPresentDegree Candidacy
verifyTextPresentYears of Participation
verifyTextPresentStart
Year
verifyTextPresentEnd
Year
clickAndWaitlink=Cancel
clickAndWaitcss=a.add-advisorIn > img.add-individual
assertTitleEdit
selectid=selectorlabel=Undergraduate Advising Relationship
clickAndWaitcss=input.submit
assertTitleEdit
verifyTextPresentYou must enter a value in the Last Name field.
verifyTextPresentYou must enter a value in the First Name field.
selectid=selectorlabel=Undergraduate Advising Relationship
typeid=adviseeSmith
clickAndWaitcss=input.submit
assertTitleEdit
verifyTextPresentYou must enter a value in the First Name field.
selectid=selectorlabel=Undergraduate Advising Relationship
typeid=advisee
typeid=firstNameJoe
clickAndWaitcss=input.submit
verifyTextPresentYou must enter a value in the Last Name field.
selectid=selectorlabel=Undergraduate Advising Relationship
typeid=adviseeSmith
typeid=firstNameJoe
clickAndWaitcss=input.submit
verifyTextPresentundergraduate advising relationship
verifyElementPresentlink=Smith, Joe
clickAndWaitcss=a.add-advisorIn > img.add-individual
assertTitleEdit
selectid=selectorlabel=Graduate Advising Relationship
typeid=adviseeDoe
typeid=firstNameJohn
typeid=SubjectAreaPrimates
selectid=degreeUrilabel=M.S. Master of Science
typeid=startField-year2008
typeid=endField-year2011
clickAndWaitcss=input.submit
assertTitleFaculty, Jane
verifyTextPresentundergraduate advising relationship
verifyElementPresentlink=Smith, Joe
verifyTextPresentgraduate advising relationship
verifyTextPresentDoe, John, M.S.  candidate, 2008 - 2011
verifyElementPresentlink=Doe, John
clickAndWaitcss=a.add-advisorIn > img.add-individual
assertTitleEdit
selectid=selectorlabel=Faculty Mentoring Relationship
typeid=adviseeAdams
typeid=firstNameJeff
typeid=SubjectAreaPrimate Health
typeid=startField-year2012
clickAndWaitcss=input.submit
assertTitleFaculty, Jane
verifyTextPresentundergraduate advising relationship
verifyElementPresentlink=Smith, Joe
verifyTextPresentgraduate advising relationship
verifyTextPresentDoe, John, M.S.  candidate, 2008 - 2011
verifyElementPresentlink=Doe, John
verifyTextPresentfaculty mentoring relationship
verifyTextPresentAdams, Jeff, 2012 -
verifyElementPresentlink=Adams, Jeff
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
- - + + + + + + +AddPositions + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AddPositions
deleteAllVisibleCookies
setTimeout100000
open/vivo/
assertTitleVIVO
clickAndWaitlink=Log in
assertTitleLog in to VIVO
typeloginNametestAdmin@cornell.edu
typeloginPasswordPassword
clickAndWaitloginForm
clickAndWaitlink=Index
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
click//div[@id='wrapper-content']/ul/li[8]
clickAndWaitxpath=(//img[@alt='add'])[23]
assertTitleEdit
verifyTextPresentCreate advisor relationship entry for Faculty, Jane
verifyTextPresentAdvising Relationship Type
verifyTextPresentAdvisee: Last name
verifyTextPresentFirst name
verifyTextPresentSubject Area
verifyTextPresentDegree Candidacy
verifyTextPresentYears of Participation
verifyTextPresentStart Year
verifyTextPresentEnd Year
clickAndWaitlink=Cancel
clickAndWaitxpath=(//img[@alt='add'])[23]
assertTitleEdit
selectid=selectorlabel=Undergraduate Advising Relationship
clickAndWaitcss=input.submit
assertTitleEdit
verifyTextPresentYou must enter a value in the Last Name field.
verifyTextPresentYou must enter a value in the First Name field.
selectid=selectorlabel=Undergraduate Advising Relationship
typeid=adviseeSmith
clickAndWaitcss=input.submit
assertTitleEdit
verifyTextPresentYou must enter a value in the First Name field.
selectid=selectorlabel=Undergraduate Advising Relationship
typeid=advisee
typeid=firstNameJoe
clickAndWaitcss=input.submit
verifyTextPresentYou must enter a value in the Last Name field.
selectid=selectorlabel=Undergraduate Advising Relationship
typeid=adviseeSmith
typeid=firstNameJoe
clickAndWaitcss=input.submit
verifyTextPresentundergraduate advising relationship
verifyElementPresentlink=Smith, Joe
clickAndWaitxpath=(//img[@alt='add'])[23]
assertTitleEdit
selectid=selectorlabel=Graduate Advising Relationship
typeid=adviseeDoe
typeid=firstNameJohn
typeid=SubjectAreaPrimates
selectid=degreeUrilabel=M.S. Master of Science
typeid=startField-year2008
typeid=endField-year2011
clickAndWaitcss=input.submit
assertTitleFaculty, Jane
verifyTextPresentundergraduate advising relationship
verifyElementPresentlink=Smith, Joe
verifyTextPresentgraduate advising relationship
verifyTextPresentDoe, John, M.S.  candidate, 2008 - 2011
verifyElementPresentlink=Doe, John
clickAndWaitxpath=(//img[@alt='add'])[23]
assertTitleEdit
selectid=selectorlabel=Faculty Mentoring Relationship
typeid=adviseeAdams
typeid=firstNameJeff
typeid=SubjectAreaPrimate Health
typeid=startField-year2012
clickAndWaitcss=input.submit
assertTitleFaculty, Jane
verifyTextPresentundergraduate advising relationship
verifyElementPresentlink=Smith, Joe
verifyTextPresentgraduate advising relationship
verifyTextPresentDoe, John, M.S.  candidate, 2008 - 2011
verifyElementPresentlink=Doe, John
verifyTextPresentfaculty mentoring relationship
verifyTextPresentAdams, Jeff, 2012 -
verifyElementPresentlink=Adams, Jeff
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html index ff3b5607..850e9433 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html @@ -116,9 +116,14 @@ Faculty Member + + selectWindow + null + + clickAndWait - css=a.add-preferredTitle > img.add-individual + css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual @@ -126,24 +131,14 @@ Edit - - verifyTextPresent - Add new entry for: preferred title - - - - waitForElementPresent - tinymce - - type - tinymce + id=preferredTitle Assistant Professor clickAndWait - submit + id=submit diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html index f031e578..02f4d4da 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html @@ -86,9 +86,14 @@ + + click + //div[@id='wrapper-content']/ul/li[12] + + clickAndWait - css=a.add-awardOrHonor > img.add-individual + xpath=(//img[@alt='add'])[33] @@ -108,9 +113,14 @@ + + click + //div[@id='wrapper-content']/ul/li[12] + + clickAndWait - css=a.add-awardOrHonor > img.add-individual + xpath=(//img[@alt='add'])[33] @@ -188,7 +198,7 @@ clickAndWait - css=a.add-awardOrHonor > img.add-individual + xpath=(//img[@alt='add'])[33] @@ -270,7 +280,7 @@ clickAndWait - css=a.add-awardOrHonor > img.add-individual + xpath=(//img[@alt='add'])[33] @@ -565,6 +575,11 @@ Primate Expert + + click + //div[@id='wrapper-content']/ul/li[6] + + verifyElementPresent link=Primates-R-Us diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html index ff3b5607..4dc84355 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html @@ -11,6 +11,26 @@ CreateTestFacultyMember + + selectWindow + null + + + + clickAndWait + css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual + + + + assertTitle + Edit + + + + assertTitle + Faculty, Jane + + deleteAllVisibleCookies @@ -118,7 +138,7 @@ clickAndWait - css=a.add-preferredTitle > img.add-individual + css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual @@ -126,24 +146,14 @@ Edit - - verifyTextPresent - Add new entry for: preferred title - - - - waitForElementPresent - tinymce - - type - tinymce + id=preferredTitle Assistant Professor clickAndWait - submit + id=submit diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html index 1dc09965..1be3cab9 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html @@ -85,9 +85,14 @@ Faculty, Jane + + click + //div[@id='wrapper-content']/ul/li[12] + + clickAndWait - //h3[@id='educationalTraining']/a/img + css=a.add-RO_0000056 > img.add-individual @@ -108,7 +113,12 @@ clickAndWait - //h3[@id='educationalTraining']/a/img + css=a.add-RO_0000056 > img.add-individual + + + + assertTitle + Edit @@ -197,7 +207,7 @@ select - degree + id=degreeUri label=B.S. Bachelor of Science @@ -261,9 +271,10 @@ link=Carroll College + clickAndWait - //h3[@id='educationalTraining']/a/img + css=a.add-RO_0000056 > img.add-individual @@ -271,32 +282,6 @@ Edit - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - select id=typeSelector @@ -319,7 +304,7 @@ select - degree + id=degreeUri label=M.B.A. Master of Business Administration @@ -342,6 +327,31 @@ submit + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + assertTitle @@ -371,7 +381,12 @@ clickAndWait - //h3[@id='educationalTraining']/a/img + css=a.add-RO_0000056 > img.add-individual + + + + assertTitle + Edit @@ -379,11 +394,6 @@ id=typeSelector label=University - - assertTitle - Edit - - type relatedIndLabel @@ -396,7 +406,7 @@ select - degree + id=degreeUri label=M.Ed. Master of Education diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html index ed290ece..de31c06d 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html @@ -80,12 +80,12 @@ link=Faculty, Jane + assertTitle Faculty, Jane - verifyTextPresent B.S. in Business Administration, Carroll College 1980 @@ -104,7 +104,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[3]/ul/li[3]/a[2]/img + xpath=(//img[@alt='edit this entry'])[4] @@ -191,7 +191,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[3]/ul/li[2]/a[2]/img + xpath=(//img[@alt='edit this entry'])[3] @@ -258,7 +258,7 @@ clickAndWait - css=a.edit-educationalTraining > img.edit-individual + css=a.edit-RO_0000056 > img.edit-individual diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html index ff3b5607..8436282e 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html @@ -116,9 +116,14 @@ Faculty Member + + selectWindow + null + + clickAndWait - css=a.add-preferredTitle > img.add-individual + css=header > #ARG_2000028 > a.add-ARG_2000028 @@ -126,24 +131,14 @@ Edit - - verifyTextPresent - Add new entry for: preferred title - - - - waitForElementPresent - tinymce - - type - tinymce + id=preferredTitle Assistant Professor clickAndWait - submit + id=submit diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 4646f5cd..0ed441b8 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -107,9 +107,14 @@ + + selectWindow + null + + clickAndWait - css=a.delete-educationalTraining > img.delete-individual + css=a.delete-RO_0000056 > img.delete-individual @@ -119,7 +124,7 @@ clickAndWait - submit + id=submit @@ -129,7 +134,7 @@ clickAndWait - css=a.delete-educationalTraining > img.delete-individual + css=a.delete-RO_0000056 > img.delete-individual @@ -139,7 +144,7 @@ clickAndWait - submit + id=submit @@ -149,7 +154,7 @@ clickAndWait - css=a.delete-educationalTraining > img.delete-individual + css=a.delete-RO_0000056 > img.delete-individual @@ -159,7 +164,7 @@ clickAndWait - submit + id=submit diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html index cb6171b7..fa0077d0 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html @@ -47,11 +47,21 @@ carroll - VIVO Search Results + + verifyTextPresent + Carroll College College + + verifyElementPresent link=Carroll College + + verifyTextPresent + Carroll University University + + verifyElementPresent link=Carroll University @@ -77,11 +87,21 @@ wisconsin - VIVO Search Results + + verifyTextPresent + University of Wisconsin University + + verifyElementPresent link=University of Wisconsin + + verifyTextPresent + Wisconsin State or Province + + verifyElementPresent link=Wisconsin diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html index ff3b5607..850e9433 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html @@ -116,9 +116,14 @@ Faculty Member + + selectWindow + null + + clickAndWait - css=a.add-preferredTitle > img.add-individual + css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual @@ -126,24 +131,14 @@ Edit - - verifyTextPresent - Add new entry for: preferred title - - - - waitForElementPresent - tinymce - - type - tinymce + id=preferredTitle Assistant Professor clickAndWait - submit + id=submit diff --git a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html index e1199fb0..8746ed9e 100644 --- a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html +++ b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html @@ -80,6 +80,21 @@ Ontologies + + verifyTextPresent + Ontology + + + + verifyTextPresent + Namespace + + + + verifyTextPresent + Prefix + + verifyTextNotPresent