From 2cb38eab37640834e1af3a1abbfb5915f3130c05 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 11 Jul 2011 20:34:09 +0000 Subject: [PATCH] More test changes from Holly. --- .../AddEducationBackground.html | 16 ++++---- .../ChangeEducationBackground.html | 15 ++++--- .../CreateTestFacultyMember.html | 40 +++++++------------ .../SearchEducationBackground.html | 15 +++++++ 4 files changed, 48 insertions(+), 38 deletions(-) diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html index ec944a32..099e75b7 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html @@ -246,12 +246,12 @@ type - startField.year + startField-year type - endField.year + endField-year 1980 @@ -276,12 +276,12 @@ type - startField.year + startField-year type - endField.year + endField-year 1980 @@ -396,12 +396,12 @@ type - startField.year + startField-year 1998 type - endField.year + endField-year 2000 @@ -481,12 +481,12 @@ type - startField.year + startField-year 2002 type - endField.year + endField-year diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html index 09fd6917..7f1820c1 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html @@ -146,7 +146,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/ul/li[3]/a[2]/img + //div[@id='wrapper-content']/section[7]/article[3]/ul/li[3]/a[2]/img @@ -161,12 +161,12 @@ type - startField.year + startField-year type - endField.year + endField-year 1981 @@ -234,9 +234,14 @@ Change department for M.B.A. degree + + assertTitle + Faculty, Jane + + clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/ul/li[2]/a[2]/img + //div[@id='wrapper-content']/section[7]/article[3]/ul/li[2]/a[2]/img @@ -311,7 +316,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/ul/li[1]/a[2]/img + css=a.edit-educationalTraining > img.edit-individual diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html index aea956bd..561a6ccd 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html @@ -39,6 +39,11 @@ + + setTimeout + 100000 + + open /vivo/ @@ -145,57 +150,42 @@ - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel + assertTextPresent + Faculty Member clickAndWait - //input[@value='Edit This Individual'] + css=a.add-preferredTitle > img.add-individual assertTitle - Individual Editing Form + Edit - select - Moniker - label=[new moniker] + verifyTextPresent + Add new entry for: preferred title + type - MonikerSelectAlt + tinymce Assistant Professor clickAndWait - primaryAction + submit assertTitle - Individual Control Panel - - - - comment - Verify that account was created - - - - verifyTextPresent Faculty, Jane - verifyTextPresent + assertTextPresent Assistant Professor diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html index 25e31faa..6a301916 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html @@ -79,6 +79,11 @@ link=Carroll University + + verifyElementPresent + link=Faculty, Jane + + type querytext @@ -99,6 +104,16 @@ link=University of Wisconsin + + verifyElementPresent + link=Wisconsin + + + + verifyElementPresent + link=Faculty, Jane + + clickAndWait link=Home