diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html index 05335446..0603e0b1 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html @@ -381,7 +381,7 @@ assertTitle - Property Groups + VIVO diff --git a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html index 7d3f309b..8d2bb731 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html +++ b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html @@ -126,12 +126,22 @@ verifyTextPresent - Class Group: Times + Class Group verifyTextPresent - Ontology: VIVO core + Times + + + + verifyTextPresent + Ontology + + + + verifyTextPresent + VIVO core @@ -171,12 +181,22 @@ verifyTextPresent - Class Group: Times + Class Group verifyTextPresent - Ontology: VIVO core + Times + + + + verifyTextPresent + Ontology + + + + verifyTextPresent + VIVO core @@ -189,11 +209,6 @@ Class Control Panel - - assertTitle - VIVO - - clickAndWait link=Site Admin @@ -214,11 +229,6 @@ VIVO - - assertTitle - VIVO Site Administration - - comment View class groups @@ -251,7 +261,7 @@ verifyTextPresent - Classes: Hours + Classes diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index ae31ce08..43650024 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -2009,141 +2009,6 @@ Index of Contents - - clickAndWait - link=Award or Honor Receipt - - - - assertTitle - Award or Honor Receipt - - - - clickAndWait - link=Chimp Lover for Life (Faculty, Jane) - - - - assertTitle - Chimp Lover for Life (Faculty, Jane) - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - name=_delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index of Contents - - - - clickAndWait - link=Award or Honor Receipt - - - - assertTitle - Award or Honor Receipt - - - - clickAndWait - link=Monkey Trainer of the Year (Faculty, Jane) - - - - assertTitle - Monkey Trainer of the Year (Faculty, Jane) - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - name=_delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - assertTitle Index of Contents @@ -2934,141 +2799,6 @@ VIVO Site Administration - - comment - Search for more stuff to be deleted - - - - type - querytext - primate - - - clickAndWait - css=input.search - - - - assertTitle - primate - VIVO Search Results - - - - clickAndWait - link=Primates Unite - - - - assertTitle - Primates Unite - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - name=_delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - type - name=querytext - primate - - - clickAndWait - css=input.search - - - - assertTitle - primate - VIVO Search Results - - - - clickAndWait - link=Primates Foundation of America - - - - assertTitle - Primates Foundation of America - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - name=_delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - comment Logout diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html index ad121ed1..efd7e70f 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html @@ -266,22 +266,22 @@ verifyTextPresent - Local Name: vivo:architecturalDetails + vivo:architecturalDetails verifyTextPresent - Group: Place + Place verifyTextPresent - Domain Class: foaf:Agent + foaf:Agent verifyTextPresent - Range Class:string + string @@ -294,11 +294,71 @@ Data Property Control Panel + + verifyTextPresent + vivo:architecturalDetails + + + + verifyTextPresent + architectural details + + + + verifyTextPresent + Place + + + + verifyTextPresent + VIVO core + + + + verifyTextPresent + architecturalDetails + + verifyElementPresent link=exact:http://xmlns.com/foaf/0.1/Agent + + verifyTextPresent + http://www.w3.org/2001/XMLSchema#string + + + + verifyTextPresent + false + + + + verifyTextPresent + editor, curator, site administrator + + + + verifyTextPresent + public + + + + verifyTextPresent + -1 + + + + verifyTextPresent + (unspecified) + + + + verifyTextPresent + http://vivoweb.org/ontology/core#architecturalDetails + + comment Log out diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html index 70a079fc..2a62d0dc 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html @@ -225,43 +225,33 @@ - verifyElementPresent - link=visiting hours + verifyTextPresent + bibo:visitingHours verifyElementPresent - link=visiting hours for + link=exact:vivo:dateTimeInterval verifyTextPresent - Local Name: bibo:visitingHoursFor + Place verifyTextPresent - Group: unspecified + Bibontology verifyTextPresent - Domain Class: vivo:Date/Time Interval + visitingHours - verifyTextPresent - Range Class:vivo:Museum - - - - clickAndWait - link=visiting hours for - - - - assertTitle - Object Property Control Panel + verifyElementPresent + link=exact:vivo:Museum @@ -270,8 +260,43 @@ - verifyElementPresent - link=exact:vivo:Museum + verifyTextPresent + false + + + + verifyTextPresent + editor, curator, site administrator + + + + verifyTextPresent + site administrator + + + + verifyTextPresent + property: 100, inverse: -1 + + + + verifyTextPresent + (unspecified) + + + + verifyTextPresent + true + + + + verifyTextPresent + ascending + + + + verifyTextPresent + http://purl.org/ontology/bibo/visitingHours diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html b/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html index d7dd15c6..19902fad 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html @@ -111,7 +111,7 @@ assertTitle - Property Groups + VIVO @@ -161,7 +161,7 @@ assertTitle - Property Groups + VIVO diff --git a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html index ea79710f..cd306adc 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html +++ b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html @@ -111,7 +111,7 @@ assertTitle - Property Groups + VIVO @@ -126,7 +126,7 @@ assertTitle - Property Group Editing Form + Classgroup Editing Form @@ -146,7 +146,7 @@ assertTitle - Property Groups + VIVO diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html index 510ae89e..5e7f97b6 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html @@ -111,7 +111,7 @@ assertTitle - Property Groups + VIVO @@ -136,7 +136,7 @@ assertTitle - Property Group Editing Form + Classgroup Editing Form @@ -161,7 +161,7 @@ assertTitle - Property Groups + VIVO diff --git a/utilities/acceptance-tests/suites/InitialSetup/CreateHTMLPage.html b/utilities/acceptance-tests/suites/InitialSetup/CreateHTMLPage.html index 9c734eb5..a933aaff 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/CreateHTMLPage.html +++ b/utilities/acceptance-tests/suites/InitialSetup/CreateHTMLPage.html @@ -249,66 +249,6 @@ This is a test. - - comment - Delete the HTML page - - - - clickAndWait - link=Site Admin - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Page management - - - - assertTitle - Pages - - - - click - xpath=(//img[@alt='delete'])[10] - - - - assertConfirmation - Are you sure you wish to delete this page:  Test HTML Page? - - - - waitForPageToLoad - 5000 - - - - assertTitle - Pages - - - - comment - Make sure it is gone - - - - verifyElementNotPresent - link=Test HTML Page - - - - verifyTextNotPresent - /html - - comment Logout diff --git a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html index 361798ba..9a89c716 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html +++ b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html @@ -169,41 +169,11 @@ Delete new menu items - - click - css=img[alt="delete"] - - - - assertConfirmation - Are you sure you wish to delete this page:  Activities? - - - - waitForPageToLoad - 5000 - - - - assertTitle - Pages - - clickAndWait css=img[alt="delete"] - - assertConfirmation - Are you sure you wish to delete this page: Activities? - - - - waitForPageToLoad - 5000 - - assertTitle Pages @@ -269,6 +239,26 @@ Pages + + click + xpath=(//img[@alt='delete'])[7] + + + + assertConfirmation + Are you sure you wish to delete this page:  Test HTML Page? + + + + waitForPageToLoad + 5000 + + + + assertTitle + Pages + + comment Verify new tabs gone