From 43089cf3f16f33f0585516d078bd62ac0c78ae07 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 19 Jul 2011 17:22:52 +0000 Subject: [PATCH] More test tweaking by Holly... --- .../CreateClasses/DeleteClassGroupTimes.html | 2 +- .../CreatePeople/SearchFacultyInfo.html | 24 ++++++------- .../DeleteEducationalBackground.html | 29 ++++++++++++---- .../DeleteTestFacultyMember.html | 10 ++++++ .../CustomPositionsForm/SearchPositions.html | 17 ++++------ .../suites/InitialSetup/Suite.html | 34 +++++++++---------- .../suites/InitialSetup/ValidateNewMenus.html | 24 ++++--------- 7 files changed, 75 insertions(+), 65 deletions(-) diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html index 67aeb781..444df4a6 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html +++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html @@ -156,7 +156,7 @@ waitForPageToLoad - 5000 + 10000 diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index bd173bfc..1cd171b0 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -164,16 +164,6 @@ Primate Expert Association Certificate - - verifyElementPresent - link=Primate Experts - - - - verifyTextPresent - Primate Expert - - verifyElementPresent link=Licensed Primate Instructor @@ -181,7 +171,7 @@ verifyTextPresent - Licensed Primate Instructor + Licensed Primate Instructor Licensure @@ -191,7 +181,17 @@ verifyTextPresent - Licensed Primate Expert + Licensed Primate Expert Licensure + + + + verifyElementPresent + link=Primate Experts + + + + verifyTextPresent + Primate Experts Credential diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 82ef10ca..451a1c3e 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -259,6 +259,16 @@ Carroll College + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + clickAndWait //input[@value="Edit This Individual's Datatype Properties"] @@ -274,6 +284,16 @@ _delete + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + assertTitle VIVO Site Administration @@ -291,12 +311,7 @@ assertTitle - carroll college - VIVO Search Results - - - - verifyTextNotPresent - Carroll College + Search for 'carroll college' @@ -456,7 +471,7 @@ assertTitle - carroll university - VIVO Search Results + Search for 'carroll university' diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html index a78ea3fd..f75c97d1 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html @@ -139,6 +139,16 @@ _delete + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + assertTitle VIVO Site Administration diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html index 2824e6aa..a2586c1d 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html @@ -236,7 +236,7 @@ comment - Link to Carroll College to verify Jane Faculty is listed + Link to Carroll College to verify Jane Faculty is not listed @@ -249,16 +249,6 @@ Carroll College - - verifyTextPresent - Affiliation - - - - verifyTextPresent - people - - verifyElementNotPresent link=Faculty, Jane @@ -294,6 +284,11 @@ Search results for 'university' + + verifyElementPresent + link=people + + verifyElementPresent link=organizations diff --git a/utilities/acceptance-tests/suites/InitialSetup/Suite.html b/utilities/acceptance-tests/suites/InitialSetup/Suite.html index c2cde1d2..262f6d65 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/Suite.html +++ b/utilities/acceptance-tests/suites/InitialSetup/Suite.html @@ -1,17 +1,17 @@ - - - - - - Test Suite - - - - - - - - -
Test Suite
EditSiteInfo
CheckDefaultMenus
ValidateNewMenus
RemoveMenuChanges
- - + + + + + + Test Suite + + + + + + + + +
Test Suite
EditSiteInfo
CheckDefaultMenus
ValidateNewMenus
RemoveMenuChanges
+ + diff --git a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html index 4277c030..9ff502d7 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html +++ b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html @@ -206,17 +206,17 @@ verifyTextPresent - You must supply a Name + You must supply a name verifyTextPresent - You must supply a Pretty URL + You must supply a pretty URL verifyTextPresent - You must supply a Content type + You must supply a content type @@ -231,12 +231,12 @@ verifyTextPresent - You must supply a Pretty URL + You must supply a pretty URL verifyTextPresent - You must supply a Content type + You must supply a content type @@ -251,7 +251,7 @@ verifyTextPresent - You must supply a Content type + You must supply a content type @@ -774,16 +774,6 @@ Locations - - click - link=Geographic Location (37) - - - - verifyTextPresent - Geographic Location - - comment Change People menu name @@ -836,7 +826,7 @@ clickAndWait - link=People + link=People at CU