From 2fa3c98257330bd9e2a390b1e82a59ba630bca8f Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 24 Jan 2011 15:24:07 +0000 Subject: [PATCH] Holly update two test suites for vivo-basic due to changes made to application. --- .../CreateOrganization.html | 60 ++++++++----------- .../suites/CreatePeopleVB/AddFacultyInfo.html | 36 +++++------ .../CreatePeopleVB/AddFacultyInfo2.html | 20 +++---- .../CreatePeopleVB/ChangeFacultyImage.html | 5 -- .../CreatePeopleVB/DeleteFacultyInfo.html | 20 ------- .../CreatePeopleVB/DeleteTestPeople.html | 10 ---- .../CreatePeopleVB/EditFacultyInfo.html | 59 ++++++------------ 7 files changed, 70 insertions(+), 140 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html index a3c9b5e1..bcf8d576 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[4]/h3/a/img + //h3[@id='offersDegree']/a/img @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[2]/h3/a/img + //h3[@id='hasPredecessorOrganization']/a/img @@ -286,7 +286,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[5]/h3/a/img + //h3[@id='awardsGrant']/a/img @@ -321,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[7]/h3/a/img + //h3[@id='sponsors']/a/img @@ -356,7 +356,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[8]/h3/a/img + //h3[@id='awardConferred']/a/img @@ -391,7 +391,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[9]/h3/a/img + //h3[@id='hasEquipment']/a/img @@ -426,7 +426,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[6]/h3/a/img + //h3[@id='subcontractsGrant']/a/img @@ -506,7 +506,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img + //h3[@id='subOrganizationWithin']/a/img @@ -529,11 +529,6 @@ Edit - - type - name - Primate - type name @@ -551,7 +546,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img + //h3[@id='organizationForPosition']/a/img @@ -581,7 +576,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[4]/h3/a/img + //h3[@id='hasLeaderRole']/a/img @@ -621,7 +616,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[5]/h3/a/img + //h3[@id='affiliatedOrganization']/a/img @@ -646,7 +641,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[6]/h3/a/img + //h3[@id='hasMemberRole']/a/img @@ -686,7 +681,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[7]/h3/a/img + //h3[@id='hasCollaborator']/a/img @@ -711,7 +706,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[8]/h3/a/img + //h3[@id='hasClinicalRole']/a/img @@ -756,7 +751,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img + //h3[@id='authorInAuthorship']/a/img @@ -786,7 +781,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img + //h3[@id='hasPresenterRole']/a @@ -831,7 +826,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img + //h3[@id='hasOutreachProviderRole']/a/img @@ -881,7 +876,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article/h3/a/img + //h3[@id='hasGeographicLocation']/a/img @@ -911,7 +906,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='email']/a/img @@ -936,7 +931,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='phoneNumber']/a/img @@ -961,7 +956,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img + //h3[@id='faxNumber']/a/img @@ -986,7 +981,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[4]/h3/a/img + //h3[@id='mailingAddress']/a/img @@ -1031,7 +1026,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article/h3/a/img + //h3[@id='dateTimeInterval']/a/img @@ -1054,11 +1049,6 @@ Primate College of America - - assertTitle - Primate College of America - - comment Test other entry @@ -1066,7 +1056,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img + //h3[@id='abbreviation']/a/img @@ -1091,7 +1081,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html index ce44d4f3..cd565c43 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html @@ -196,7 +196,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[4]/h3/a/img + //h3[@id='hasCollaborator']/a/img @@ -216,7 +216,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img + //h3[@id='preferredTitle']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img + //h3[@id='researchOverview']/a @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[6]/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -291,7 +291,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[3]/h3/a/img + //h3[@id='advisorIn']/a/img @@ -326,7 +326,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img + //h3[@id='teachingOverview']/a/img @@ -351,7 +351,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img + //h3[@id='outreachOverview']/a/img @@ -376,7 +376,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img + //h3[@id='adviseeIn']/a/img @@ -411,7 +411,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='awardOrHonor']/a/img @@ -441,7 +441,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[2]/h3/a/img + //h3[@id='middleName']/a/img @@ -491,7 +491,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[6]/h3/a/img + //h3[@id='faxNumber']/a/img @@ -541,7 +541,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[7]/h3/a/img + //h3[@id='mailingAddress']/a/img @@ -571,7 +571,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[4]/h3/a/img + //h3[@id='prefixName']/a/img @@ -596,7 +596,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[5]/h3/a/img + //h3[@id='suffixName']/a/img @@ -621,7 +621,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[1]/h3/a/img + //h3[@id='orcidId']/a/img @@ -646,7 +646,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img + //h3[@id='scopusId']/a/img @@ -671,7 +671,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img + //h3[@id='researcherId']/a/img @@ -696,7 +696,7 @@ clickAndWait - //div[@id='wrapper-content']/section[11]/article/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html index 016d414a..853e32b0 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html @@ -171,7 +171,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[6]/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -196,7 +196,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[3]/h3/a/img + //h3[@id='advisorIn']/a/img @@ -231,7 +231,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img + //h3[@id='adviseeIn']/a @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='awardOrHonor']/a/img @@ -326,7 +326,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[6]/h3/a/img + //h3[@id='faxNumber']/a/img @@ -376,7 +376,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[7]/h3/a/img + //h3[@id='mailingAddress']/a/img @@ -411,7 +411,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[1]/h3/a/img + //h3[@id='orcidId']/a/img @@ -436,7 +436,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img + //h3[@id='researcherId']/a/img @@ -461,7 +461,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img + //h3[@id='scopusId']/a/img @@ -486,7 +486,7 @@ clickAndWait - //div[@id='wrapper-content']/section[11]/article/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html index 49e471c0..bb1a1c3b 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html @@ -264,11 +264,6 @@ Photo Upload - - verifyTextPresent - Photo Upload - - verifyTextPresent Your profile photo will look like the image below. diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html index a99584fb..6b175267 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html @@ -919,26 +919,6 @@ Faculty, Jane - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - comment Verify everything is gone diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html index 1e5749d2..c039a574 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html @@ -89,16 +89,6 @@ VIVO - - clickAndWait - link=People - - - - assertTitle - People - - comment Navigate to Jane Faculty diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html index 95a5c86f..56733268 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html @@ -196,32 +196,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[4]/ul/li/a[2]/img - - - - assertTitle - Edit - - - - select - objectVar - label=Faculty, Jane - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='wrapper-content']/section[3]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[3]/article[1]/ul/li/a[1]/img @@ -246,7 +221,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[5]/article[1]/ul/li/a[1]/img @@ -271,7 +246,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[6]/ul/li/a[2]/img + //div[@id='content']/section[5]/article[6]/ul/li/a[2] @@ -311,7 +286,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[3]/ul/li/a[2]/img + //div[@id='content']/section[6]/article[3]/ul/li/a[2]/img @@ -346,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[6]/article[1]/ul/li/a[1]/img @@ -371,7 +346,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[7]/article[1]/ul/li/a[1]/img @@ -396,7 +371,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/ul/li/a[2]/img + //div[@id='content']/section[8]/article[3]/ul/li/a[2]/img @@ -431,7 +406,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/ul/li/a[2]/img + //div[@id='content']/section[8]/article[2]/ul/li/a[2]/img @@ -466,7 +441,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[2]/ul/li/a[1]/img + //div[@id='content']/section[9]/article[2]/ul/li/a[1]/img @@ -516,7 +491,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[6]/ul/li/a[1]/img + //div[@id='content']/section[9]/article[6]/ul/li/a[1]/img @@ -571,7 +546,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[7]/ul/li/a[2]/img + //div[@id='content']/section[9]/article[7]/ul/li/a[2]/img @@ -606,7 +581,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[4]/ul/li/a[1]/img + //div[@id='content']/section[9]/article[4]/ul/li/a[1]/img @@ -631,7 +606,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[5]/ul/li/a[1]/img + //div[@id='content']/section[9]/article[5]/ul/li/a[1]/img @@ -656,7 +631,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[10]/article[1]/ul/li/a[1]/img @@ -681,7 +656,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[3]/ul/li/a[1]/img + //div[@id='content']/section[10]/article[2]/ul/li/a[1]/img @@ -706,7 +681,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[2]/ul/li/a[1]/img + //div[@id='content']/section[10]/article[3]/ul/li/a[1]/img @@ -731,7 +706,7 @@ clickAndWait - //div[@id='wrapper-content']/section[11]/article/ul/li/a[1]/img + //div[@id='content']/section[11]/article/ul/li/a[1]/img