From 1f9e8f0dfea12775c4e97f64c583880c391fcd80 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 2 Jul 2012 17:00:02 +0000 Subject: [PATCH] Holly made more changes to the AddNonPersonThings test cases... --- .../AddNonPersonThings/CheckPublicView.html | 22 +- .../AddNonPersonThings/CreateActivity.html | 22 +- .../AddNonPersonThings/CreateEquipment.html | 35 +++ .../AddNonPersonThings/CreateLocation.html | 82 ++---- .../CreateOrganization.html | 45 ++-- .../TestMenuManagement.html | 234 +++++++++++++----- .../VerifyAllThingsSearchable.html | 76 +++--- .../suites/AddNonPersonThings/suite.html | 1 + 8 files changed, 319 insertions(+), 198 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html index 15c586fc..6253d048 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html @@ -781,7 +781,7 @@ verifyTextPresent - Polly Person, Dr. 1999 - + Person, Polly, Dr. 1999 - @@ -851,12 +851,12 @@ verifyElementPresent - link=Primate Heart Health Clinic + link=Primate Heart Health verifyTextPresent - Primate Heart Health Clinic Founder 2010 - + Primate Heart Health Founder 2010 - @@ -1181,7 +1181,7 @@ verifyTextPresent - has facility + has geographic location @@ -1554,16 +1554,6 @@ provides funding for - - verifyElementPresent - link=Primate Student of the Year - - - - verifyTextPresent - Primate Student of the Year - - clickAndWait link=Index @@ -2006,12 +1996,12 @@ verifyElementPresent - link=Primate Research Lab Room 123 + link=Primate Research Laboratory verifyTextPresent - Primate Research Lab Room 123 + Primate Research Laboratory diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html index fd3065b8..0911e271 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html @@ -556,7 +556,7 @@ clickAndWait - //h3[@id='fundingVehicleFor']/a/img + css=a.add-fundingVehicleFor > img.add-individual @@ -565,18 +565,18 @@ - verifyTextPresent - Add an entry to: provides funding for + type + id=object + primate + + + click + id=ui-active-menuitem - - select - objectVar - label=Primate Student of the Year - clickAndWait - submit + id=submit @@ -690,8 +690,8 @@ - verifyTextPresent - Primate Student of the Year + verifyElementPresent + link=Primate Health Check diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html index 3db0cb8d..a44d0315 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html @@ -324,6 +324,41 @@ submit + + clickAndWait + link=Primate Research Lab Room 123 + + + + assertTitle + Primate Research Lab Room 123 + + + + clickAndWait + css=a.add-facilityFor > img.add-individual + + + + assertTitle + Edit + + + + type + id=object + Producing primate food. + + + clickAndWait + link=Cancel + + + + assertTitle + Primate Research Lab Room 123 + + assertTitle Primate Feeder diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html index 9aaca2a2..3bea1670 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html @@ -199,51 +199,6 @@ Jane Memorial Building - - comment - Test affiliation entry - - - - clickAndWait - //h3[@id='facilityFor']/a/img - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Thing for Jane Memorial Building - - - - clickAndWait - id=offerCreate - - - - assertTitle - Edit - - - - type - id=name - Primate Research Laboratory - - - clickAndWait - id=submit - - - - assertTitle - Jane Memorial Building - - comment Test location entry @@ -376,7 +331,7 @@ clickAndWait - //h3[@id='geographicLocationOf']/a/img + css=a.add-geographicLocationOf > img.add-individual @@ -385,23 +340,13 @@ - verifyTextPresent - Add an entry to: geographic location of - + type + id=object + Primate Research labor - select - objectVar - label=Primate Research Lab Room 123 - - - clickAndWait - submit - - - - assertTitle - Jane Memorial Building + click + id=ui-active-menuitem @@ -409,6 +354,16 @@ Verify everything entered is displaying properly + + clickAndWait + id=submit + + + + assertTitle + Jane Memorial Building + + verifyTextPresent Primate Research Laboratory @@ -429,11 +384,6 @@ Portable Primate Habitat - - verifyTextPresent - Primate Research Lab Room 123 - - comment Logout diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index f50c8a8d..d16dc684 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -964,6 +964,36 @@ Primate College of America + + clickAndWait + css=a.add-primaryEmail > img.add-individual + + + + assertTitle + Edit + + + + waitForElementPresent + tinymce + + + + type + tinymce + info@primates.edu + + + clickAndWait + submit + + + + assertTitle + Primate College of America + + clickAndWait //h3[@id='phoneNumber']/a/img @@ -1039,21 +1069,6 @@ id=country label=Morocco - - - - - - - clickAndWait - //input[@id='submit' and @value='Add a new item of this type'] - - - - assertTitle - Edit - - type id=addrLineOne diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html index 149dc172..a19f1d91 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html @@ -106,12 +106,12 @@ clickAndWait - link=Menu management + link=Page management assertTitle - Default Menu + Pages @@ -121,47 +121,57 @@ clickAndWait - link=Add menu item + id=submit assertTitle - Add Menu Item + Edit type - menuName + id=pageName Activities type - prettyUrl + name=prettyUrl /activities select - selectClassGroup + id=typeSelect + label=Browse Class Group + + + select + id=selectClassGroup label=activities click - allSelected + css=option[value="http://vivoweb.org/ontology#vitroClassGroupactivities"] click - submit-Add + id=doneWithContent - pause - 5000 + click + id=menuCheckbox + + + + clickAndWait + id=pageSave assertTitle - Default Menu + Pages @@ -201,52 +211,57 @@ clickAndWait - link=Add menu item + id=submit assertTitle - Add Menu Item + Edit type - menuName + id=pageName Courses type - prettyUrl + name=prettyUrl /courses select - selectClassGroup - label=people - - - click - changeContentType - + id=typeSelect + label=Browse Class Group select - selectClassGroup + id=selectClassGroup label=courses click - submit-Add + css=option[value="http://vivoweb.org/ontology#vitroClassGroupactivities"] - pause - 5000 + click + id=doneWithContent + + + + click + id=menuCheckbox + + + + clickAndWait + id=pageSave assertTitle - Default Menu + Pages @@ -291,42 +306,142 @@ clickAndWait - link=Add menu item + id=submit assertTitle - Add Menu Item + Edit type - menuName + id=pageName Equipment type - prettyUrl + name=prettyUrl /equipment select - selectClassGroup + id=typeSelect + label=Browse Class Group + + + select + id=selectClassGroup label=equipment click - submit-Add + css=option[value="http://vivoweb.org/ontology#vitroClassGroupactivities"] - pause - 5000 + click + id=doneWithContent + + + + click + id=menuCheckbox + + + + clickAndWait + id=pageSave assertTitle - Default Menu + Pages + + + + verifyTextPresent + Home + + + + verifyTextPresent + People + + + + verifyTextPresent + Organizations + + + + verifyTextPresent + Research + + + + verifyTextPresent + Events + + + + verifyTextPresent + Activities + + + + clickAndWait + id=submit + + + + assertTitle + Edit + + + + type + id=pageName + Courses + + + type + name=prettyUrl + /courses + + + select + id=typeSelect + label=Browse Class Group + + + select + id=selectClassGroup + label=courses + + + click + css=option[value="http://vivoweb.org/ontology#vitroClassGroupactivities"] + + + + click + id=doneWithContent + + + + click + id=menuCheckbox + + + + clickAndWait + id=pageSave + + + + assertTitle + Pages @@ -376,42 +491,57 @@ clickAndWait - link=Add menu item + id=submit assertTitle - Add Menu Item + Edit type - menuName + id=pageName Locations type - prettyUrl + name=prettyUrl /locations select - selectClassGroup + id=typeSelect + label=Browse Class Group + + + select + id=selectClassGroup label=locations - clickAndWait - submit-Add + click + css=option[value="http://vivoweb.org/ontology#vitroClassGroupactivities"] - pause - 5000 + click + id=doneWithContent + + + + click + id=menuCheckbox + + + + clickAndWait + id=pageSave assertTitle - Default Menu + Pages @@ -444,16 +574,6 @@ Activities - - verifyTextPresent - Courses - - - - verifyTextPresent - Equipment - - verifyTextPresent Locations diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index cbf09939..e1c8d388 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -74,6 +74,11 @@ primates - VIVO Search Results + + verifyElementPresent + link=people + + verifyElementPresent link=activities @@ -116,12 +121,7 @@ verifyTextPresent - Primate Info Database - - - - verifyTextPresent - Primate Diet Concept + Primate Feeder Equipment @@ -131,22 +131,12 @@ verifyTextPresent - Primate Feeder Equipment + Primate Diet Concept verifyTextPresent - Primate History Library Library - - - - verifyTextPresent - Primate Health and Fitness Invited Talk - - - - verifyTextPresent - Primate Colleges of the World Consortium + Primate Info Database @@ -156,7 +146,7 @@ verifyTextPresent - Primate Student of the Year Award or Honor + Primate Research Laboratory Laboratory @@ -166,7 +156,7 @@ verifyTextPresent - Primate Health Check Event + Portable Primate Habitat Equipment @@ -176,12 +166,17 @@ verifyTextPresent - Primate Health Conference Conference + Primate Colleges of the World Consortium verifyTextPresent - Primate Research Laboratory Laboratory + Primate Health Check Event + + + + verifyTextPresent + Primate Health Conference Conference @@ -191,7 +186,27 @@ verifyTextPresent - Portable Primate Habitat Equipment + Best Primate College + + + + verifyTextPresent + Primate History Library Library + + + + verifyTextPresent + Primate Student of the Year Award or Honor + + + + verifyTextPresent + Primate Health and Fitness Invited Talk + + + + verifyTextPresent + Primate Heart Health Service @@ -199,21 +214,16 @@ Primate Habitat Research Grant Grant - - verifyTextPresent - Primate Survival Planning Grant Grant - - - - verifyTextPresent - Primate Heart Health Clinic Service - - verifyTextPresent Primate Research Lab Room 123 Facility + + verifyTextPresent + Primate Survival Planning Grant Grant + + verifyTextPresent Animal Health Concept diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html index 1f67ea6e..99b692d8 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html @@ -16,6 +16,7 @@ CreateTopic CreateEquipment CreateLocation +RebuildSearchIndex VerifyAllThingsSearchable CheckPublicView CheckIndexView