From aa4274311e830cb8c4353b55435250b87560891c Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 19 Jul 2011 21:52:40 +0000 Subject: [PATCH] More test tweaks from Holly. --- .../AddNonPersonThings/DeleteIndexStuff.html | 285 ++++++++++++++++++ .../TestMenuManagement.html | 125 ++++++++ .../VerifyAllThingsSearchable.html | 24 +- .../suites/AddNonPersonThings/suite.html | 55 ++-- .../AddPublications/DeleteTestFaculty.html | 2 +- .../suites/AdminSecurity/NewAdminDelete.html | 4 +- .../AdminSecurity/NewAdminFirstLogin.html | 2 +- 7 files changed, 453 insertions(+), 44 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html index 89644720..cf4da6f2 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html @@ -1754,6 +1754,291 @@ link=Index + + clickAndWait + link=Event + + + + assertTitle + Event + + + + clickAndWait + link=Primate Health Check + + + + assertTitle + Primate Health Check + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _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 + + + + assertTitle + Award or Honor + + + + clickAndWait + link=Primate Student of the Year + + + + assertTitle + Primate Student of the Year + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _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=Campus + + + + assertTitle + Campus + + + + clickAndWait + link=Primate Research Laboratory + + + + assertTitle + Primate Research Laboratory + + + + assertTitle + Primate Research Laboratory + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _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=Facility + + + + assertTitle + Facility + + + + clickAndWait + link=Primate Research Lab Room 123 + + + + assertTitle + Primate Research Lab Room 123 + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual's Datatype Properties"] + + + + assertTitle + Individual Editing Form + + + + click + _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 + + comment Do some pausing and refreshing diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html index 50e3d5c6..b955898b 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html @@ -144,6 +144,16 @@ selectClassGroup label=activities + + click + allSelected + + + + click + allSelected + + clickAndWait submit-Add @@ -229,6 +239,16 @@ css=option[value=http://vivoweb.org/ontology#vitroClassGroupcourses] + + click + allSelected + + + + click + allSelected + + clickAndWait submit-Add @@ -304,6 +324,16 @@ selectClassGroup label=equipment + + click + allSelected + + + + click + allSelected + + clickAndWait submit-Add @@ -384,6 +414,16 @@ selectClassGroup label=locations + + click + allSelected + + + + click + allSelected + + clickAndWait submit-Add @@ -604,6 +644,91 @@ link=Lab Admin Office + + comment + Delete new menus + + + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Menu management + + + + assertTitle + Default Menu + + + + clickAndWait + //div[@id='wrapper-content']/ul/li[5]/span/a[2]/img + + + + assertTitle + Remove Menu Item + + + + clickAndWait + removeMenuItem + + + + assertTitle + Default Menu + + + + clickAndWait + //div[@id='wrapper-content']/ul/li[5]/span/a[2]/img + + + + assertTitle + Remove Menu Item + + + + clickAndWait + removeMenuItem + + + + assertTitle + Default Menu + + + + clickAndWait + //div[@id='wrapper-content']/ul/li[5]/span/a[2]/img + + + + assertTitle + Remove Menu Item + + + + clickAndWait + removeMenuItem + + + + assertTitle + Default Menu + + comment Logout diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index 4382a29e..3ecaf088 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -219,16 +219,6 @@ Primate Research Laboratory Campus - - verifyTextPresent - Primate Research Lab Room 123 Facility - - - - verifyTextPresent - Animal Health Subject Area - - verifyTextPresent http://primatehealthintro.cornell.edu Webpage @@ -244,6 +234,16 @@ 1234 Northern African Nation Address + + verifyTextPresent + Animal Health Subject Area + + + + verifyTextPresent + Primate Research Lab Room 123 Facility + + clickAndWait link=2 @@ -286,12 +286,12 @@ verifyTextPresent - northern Africa + northern Africa geographical_region verifyTextPresent - Africa + Africa geographical_region diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html index 3fa11501..222e5110 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html @@ -1,28 +1,27 @@ - - - - - - Test Suite - - - - - - - - - - - - - - - - - - - -
Test Suite
CreateLibrarian
CreateOrganization
CreateCourse
CreateActivity
CreateEvent
CreateTopic
CreateEquipment
CreateLocation
VerifyAllThingsSearchable
CheckPublicView
CheckIndexView
CheckBrowseOptions
TestMenuManagement
DeleteIndexStuff
DeleteOtherStuff
- - + + + + + + Test Suite + + + + + + + + + + + + + + + + + + +
Test Suite
CreateLibrarian
CreateOrganization
CreateCourse
CreateActivity
CreateEvent
CreateTopic
CreateEquipment
CreateLocation
VerifyAllThingsSearchable
CheckPublicView
CheckIndexView
CheckBrowseOptions
TestMenuManagement
DeleteIndexStuff
+ + diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html index 1219ce22..3daec7a2 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html @@ -256,7 +256,7 @@ waitForPageToLoad - 5000 + 10000 diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html index 3db85a1b..4fa0f8a8 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html @@ -41,7 +41,7 @@ setTimeout - 100000 + 10000000 @@ -166,7 +166,7 @@ verifyTextPresent - Deleted 1 accounts. + Deleted 1 accounts. diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html index 0f9e56de..76fb5aa4 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html @@ -41,7 +41,7 @@ setTimeout - 100000 + 10000000