diff --git a/utilities/acceptance-tests/suites/InitialSetup/CheckDefaultMenus.html b/utilities/acceptance-tests/suites/InitialSetup/CheckDefaultMenus.html index 8c43342c..9e79d74f 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/CheckDefaultMenus.html +++ b/utilities/acceptance-tests/suites/InitialSetup/CheckDefaultMenus.html @@ -106,7 +106,7 @@ clickAndWait - link=Menu management + link=Menu ordering diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index 0d2aaf06..5d94017c 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html @@ -127,7 +127,7 @@ type CopyrightAnchor - VIVO Project 2011 + VIVO Project 2012 clickAndWait @@ -161,7 +161,7 @@ verifyTextPresent - VIVO Project 2011 + VIVO Project 2012 diff --git a/utilities/acceptance-tests/suites/InitialSetup/Suite.html b/utilities/acceptance-tests/suites/InitialSetup/Suite.html index 61521b22..cc26885b 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/Suite.html +++ b/utilities/acceptance-tests/suites/InitialSetup/Suite.html @@ -1,18 +1,18 @@ - - - - - - Test Suite - - - - - - - - - -
Test Suite
RebuildSearchIndex
EditSiteInfo
CheckDefaultMenus
ValidateNewMenus
RemoveMenuChanges
- - + + + + + + Test Suite + + + + + + + + + +
Test Suite
RebuildSearchIndex
EditSiteInfo
CheckDefaultMenus
ValidateNewMenus
RemoveMenuChanges
+ + diff --git a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html index 11bc5b34..1c79a76f 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html +++ b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html @@ -106,7 +106,7 @@ clickAndWait - link=Menu management + link=Menu ordering @@ -121,32 +121,37 @@ clickAndWait - link=Add menu item + id=submit assertTitle - Add Menu Item + Edit verifyTextPresent - Name * + Title verifyTextPresent - Pretty URL * + Content Type verifyTextPresent - Must begin with a leading forward slash: / (e.g., /people) + Pretty URL verifyTextPresent - Template * + Must begin with a leading forward slash + + + + verifyTextPresent + Template @@ -161,12 +166,17 @@ verifyTextPresent - Select content type for the associated page * + This is a menu page verifyTextPresent - or Cancel + Menu Item Name + + + + verifyTextPresent + If left blank, the page title will be used. @@ -175,13 +185,23 @@ - verifyTextPresent - * required fields + click + id=cancelPage clickAndWait - link=Cancel + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Menu ordering @@ -191,147 +211,72 @@ clickAndWait - link=Add menu item + id=submit assertTitle - Add Menu Item - - - - click - submit-Add - - - - verifyTextPresent - You must supply a name - - - - verifyTextPresent - You must supply a pretty URL - - - - verifyTextPresent - The pretty URL must begin with a leading forward slash - - - - verifyTextPresent - You must supply a content type + Edit type - menuName + name=pageName Activities + + select + id=typeSelect + label=Browse Class Group + + + select + id=selectClassGroup + label=activities + click - submit-Add + css=option[value="http://vivoweb.org/ontology#vitroClassGroupactivities"] - verifyTextPresent - You must supply a pretty URL - - - - verifyTextPresent - The pretty URL must begin with a leading forward slash - - - - verifyTextPresent - You must supply a content type + click + id=doneWithContent type name=prettyUrl - http://localhost:8080/vivo/activities - - - click - name=submit-Add - - - - verifyTextPresent - The pretty URL must begin with a leading forward slash - - - - verifyTextPresent - You must supply a content type - - - - type - prettyUrl /activities - - click - submit-Add - - - - verifyTextPresent - You must supply a content type - - - - select - selectClassGroup - label=activities - - - verifyTextPresent - Selected content type for the associated page - - - - verifyTextPresent - Change content type - - - - verifyElementPresent - changeContentType - - - - verifyTextPresent - Select content to display * - - - - verifyTextPresent - Only display activities within my institution - - - - verifyTextPresent - To enable this option, you must first select an institutional internal class for your instance - - - - verifyElementPresent - link=institutional internal class - - clickAndWait - submit-Add + id=pageSave assertTitle - Default Menu + Pages + + + + verifyTextPresent + Activities + + + + verifyElementPresent + link=Activities + + + + verifyTextPresent + /activities + + + + verifyTextPresent + Events @@ -339,31 +284,26 @@ Home - - verifyTextPresent - People - - verifyTextPresent Organizations + + verifyTextPresent + Pages + + + + verifyTextPresent + People + + verifyTextPresent Research - - verifyTextPresent - Activities - - - - verifyTextPresent - Events - - comment Add Courses menu @@ -371,47 +311,82 @@ clickAndWait - link=Add menu item + id=submit assertTitle - Add Menu Item + Edit type - menuName + name=pageName Courses - type - prettyUrl - /courses + select + id=typeSelect + label=Browse Class Group select - selectClassGroup - label=people - - - click - changeContentType - - - - select - selectClassGroup + id=selectClassGroup label=courses + + click + id=doneWithContent + + + + type + name=prettyUrl + /courses + clickAndWait - submit-Add + id=pageSave assertTitle - Default Menu + Pages + + + + verifyTextPresent + Activities + + + + verifyElementPresent + link=Activities + + + + verifyTextPresent + /activities + + + + verifyTextPresent + Courses + + + + verifyElementPresent + link=Courses + + + + verifyTextPresent + /courses + + + + verifyTextPresent + Events @@ -419,6 +394,16 @@ Home + + verifyTextPresent + Organizations + + + + verifyTextPresent + Pages + + verifyTextPresent People @@ -429,26 +414,6 @@ Research - - verifyTextPresent - Organizations - - - - verifyTextPresent - Activities - - - - verifyTextPresent - Courses - - - - verifyTextPresent - Events - - comment Add Equipment menu @@ -456,57 +421,97 @@ clickAndWait - link=Add menu item + id=submit assertTitle - Add Menu Item + Edit type - menuName + name=pageName Equipment - type - prettyUrl - /equipment + select + id=typeSelect + label=Browse Class Group select - selectClassGroup + id=selectClassGroup label=equipment + + click + css=option[value="http://vivoweb.org/ontology#vitroClassGroupequipment"] + + + + click + id=doneWithContent + + + + type + name=prettyUrl + /equipment + clickAndWait - submit-Add + id=pageSave assertTitle - Default Menu + Pages verifyTextPresent - Home + Activities + + + + verifyElementPresent + link=Activities verifyTextPresent - People + /activities verifyTextPresent - Organizations + Courses + + + + verifyElementPresent + link=Courses verifyTextPresent - Research + /courses + + + + verifyTextPresent + Equipment + + + + verifyElementPresent + link=Equipment + + + + verifyTextPresent + /equipment @@ -516,17 +521,27 @@ verifyTextPresent - Activities + Home verifyTextPresent - Courses + Organizations verifyTextPresent - Equipment + Pages + + + + verifyTextPresent + People + + + + verifyTextPresent + Research @@ -536,37 +551,102 @@ clickAndWait - link=Add menu item + id=submit assertTitle - Add Menu Item + Edit type - menuName + name=pageName Locations - type - prettyUrl - /locations + select + id=typeSelect + label=Browse Class Group select - selectClassGroup + id=selectClassGroup label=locations + + click + css=option[value="http://vivoweb.org/ontology#vitroClassGrouplocations"] + + + + click + id=doneWithContent + + + + type + name=prettyUrl + /locations + clickAndWait - submit-Add + id=pageSave assertTitle - Default Menu + Pages + + + + verifyTextPresent + Activities + + + + verifyElementPresent + link=Activities + + + + verifyTextPresent + /activities + + + + verifyTextPresent + Courses + + + + verifyElementPresent + link=Courses + + + + verifyTextPresent + /courses + + + + verifyTextPresent + Equipment + + + + verifyElementPresent + link=Equipment + + + + verifyTextPresent + /equipment + + + + verifyTextPresent + Events @@ -576,7 +656,17 @@ verifyTextPresent - People + Locations + + + + verifyElementPresent + link=Locations + + + + verifyTextPresent + /locations @@ -584,36 +674,21 @@ Organizations + + verifyTextPresent + Pages + + + + verifyTextPresent + People + + verifyTextPresent Research - - verifyTextPresent - Activities - - - - verifyTextPresent - Courses - - - - verifyTextPresent - Equipment - - - - verifyTextPresent - Locations - - - - verifyTextPresent - Events - - comment Check Activities menu tab