diff --git a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html index e46f7354..9d7df95e 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html +++ b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html @@ -106,12 +106,12 @@ clickAndWait - link=Menu management + link=Page management assertTitle - Default Menu + Pages @@ -171,127 +171,82 @@ clickAndWait - //div[@id='wrapper-content']/ul/li[6]/span/a[2]/img + css=img[alt="delete"] + + + + assertConfirmation + Are you sure you wish to delete this page: Activities? + + + + waitForPageToLoad + 5000 assertTitle - Remove Menu Item + Pages - verifyTextPresent - Remove menu item + click + css=img[alt="delete"] - verifyTextPresent - Are you sure you want to remove Activities menu item? + assertConfirmation + Are you sure you wish to delete this page:  Courses? - verifyTextPresent - or Cancel - - - - verifyElementPresent - link=Cancel - - - - clickAndWait - link=Cancel + waitForPageToLoad + 5000 assertTitle - Default Menu + Pages - verifyTextPresent - Activities + click + css=img[alt="delete"] - clickAndWait - //div[@id='wrapper-content']/ul/li[6]/span/a[2]/img + assertConfirmation + Are you sure you wish to delete this page:  Equipment? + + + + waitForPageToLoad + 5000 assertTitle - Remove Menu Item + Pages - clickAndWait - removeMenuItem + click + xpath=(//img[@alt='delete'])[3] + + + + assertConfirmation + Are you sure you wish to delete this page:  Locations? + + + + waitForPageToLoad + 5000 assertTitle - Default Menu - - - - clickAndWait - //div[@id='wrapper-content']/ul/li[6]/span/a[2]/img - - - - assertTitle - Remove Menu Item - - - - clickAndWait - removeMenuItem - - - - assertTitle - Default Menu - - - - clickAndWait - //div[@id='wrapper-content']/ul/li[6]/span/a[2]/img - - - - assertTitle - Remove Menu Item - - - - clickAndWait - removeMenuItem - - - - assertTitle - Default Menu - - - - clickAndWait - //div[@id='wrapper-content']/ul/li[6]/span/a[2]/img - - - - assertTitle - Remove Menu Item - - - - clickAndWait - removeMenuItem - - - - assertTitle - Default Menu + Pages diff --git a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html index 1c79a76f..43eb4606 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html +++ b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html @@ -189,6 +189,16 @@ id=cancelPage + + refreshAndWait + 10000 + + + + assertTitle + Pages + + clickAndWait link=Site Admin @@ -249,6 +259,16 @@ name=prettyUrl /activities + + click + id=menuCheckbox + + + + click + id=menuCheckbox + + clickAndWait id=pageSave @@ -344,6 +364,11 @@ name=prettyUrl /courses + + click + id=menuCheckbox + + clickAndWait id=pageSave @@ -459,6 +484,11 @@ name=prettyUrl /equipment + + click + id=menuCheckbox + + clickAndWait id=pageSave @@ -589,6 +619,11 @@ name=prettyUrl /locations + + click + id=menuCheckbox + + clickAndWait id=pageSave @@ -875,13 +910,8 @@ - comment - Change People menu name - - - - clickAndWait - link=Site Admin + verifyTextPresent + Continent @@ -889,121 +919,6 @@ VIVO Site Administration - - clickAndWait - link=Menu management - - - - assertTitle - Default Menu - - - - clickAndWait - css=img.edit-individual - - - - assertTitle - Edit Menu Item - - - - type - menuName - People at CU - - - clickAndWait - submit-Edit - - - - assertTitle - Default Menu - - - - clickAndWait - link=People at CU - - - - assertTitle - People at CU - - - - verifyTextPresent - There is currently no People at CU content in the system - - - - comment - Change People menu name back - - - - clickAndWait - link=Site Admin - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Menu management - - - - assertTitle - Default Menu - - - - clickAndWait - css=img.edit-individual - - - - assertTitle - Edit Menu Item - - - - type - menuName - People - - - clickAndWait - submit-Edit - - - - assertTitle - Default Menu - - - - clickAndWait - link=People - - - - assertTitle - People - - - - verifyTextPresent - There is currently no People content in the system - - comment Logout