diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html index 72a39066..2586e5a6 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html @@ -2769,76 +2769,6 @@ Index of Contents - - clickAndWait - link=County - - - - assertTitle - County - - - - clickAndWait - link=Mozamia - - - - assertTitle - Mozamia - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - name=_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 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html index bbac0b1f..60ee40f1 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html @@ -663,21 +663,6 @@ link=Primate Memorial Building - - click - link=County (1) - - - - pause - 5000 - - - - verifyElementPresent - link=Mozamia - - click link=Facility (5) @@ -754,6 +739,36 @@ xpath=(//img[@alt='delete this page'])[2] + + assertConfirmation + Are you sure you wish to delete this page:  Activities? + + + + waitForPageToLoad + 5000 + + + + assertTitle + Pages + + + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + assertTitle Pages @@ -779,6 +794,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[6] @@ -799,6 +834,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[7] @@ -819,6 +874,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html index 023a40be..74c71da2 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html @@ -359,8 +359,23 @@ type id=relatedIndLabel + + + + sendKeys + id=relatedIndLabel Child + + pause + 5000 + + + + sendKeys + id=relatedIndLabel + ${KEY_DOWN} + click id=ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html index 7c6d9878..3be86f61 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html @@ -259,8 +259,23 @@ type id=relatedIndLabel + + + + sendKeys + id=relatedIndLabel Child + + pause + 5000 + + + + sendKeys + id=relatedIndLabel + ${KEY_DOWN} + click id=ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/AddPublications/AddConference.html b/utilities/acceptance-tests/suites/AddPublications/AddConference.html index 5980aacb..6ce4159f 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddConference.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddConference.html @@ -209,8 +209,23 @@ type id=relatedIndLabel + + + + sendKeys + id=relatedIndLabel Child + + pause + 5000 + + + + sendKeys + id=relatedIndLabel + ${KEY_DOWN} + click id=ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html index 9e125ac3..3029ce8a 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html @@ -299,12 +299,12 @@ clickAndWait - link=Kids Now! + link=Focus on Kids! assertTitle - Kids Now! + Focus on Kids! @@ -560,12 +560,12 @@ clickAndWait - link=Kids Now! + link=Focus on Kids Too! assertTitle - Kids Now! + Focus on Kids Too! @@ -860,12 +860,12 @@ clickAndWait - link=Kids Now! + link=Focus on Kids Project assertTitle - Kids Now! + Focus on Kids Project diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index 62ebb566..80c4778a 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -845,8 +845,23 @@ type id=lastName + + + + sendKeys + id=lastName Mous + + pause + 5000 + + + + sendKeys + id=lastName + ${KEY_DOWN} + click id=ui-active-menuitem @@ -984,6 +999,11 @@ link=Cancel + + pause + 5000 + + assertTitle Nintendo O.K. for Kids @@ -1103,7 +1123,7 @@ type id=label - Kids Now! + Focus on Kids! clickAndWait @@ -1412,7 +1432,22 @@ type id=object - United States of + + + + sendKeys + id=object + United States of Am + + + pause + 5000 + + + + sendKeys + id=object + ${KEY_DOWN} click @@ -2065,13 +2100,7 @@ type id=label - Kids No - - - - click - id=ui-active-menuitem - + Focus on Kids Project clickAndWait @@ -2285,16 +2314,15 @@ link=Cancel + + selectWindow + null + + type id=label - Kids Now C - - - - click - id=ui-active-menuitem - + Focus on Kids Too! clickAndWait @@ -2355,7 +2383,7 @@ select id=objectVar - label=Kids Now! + label=Focus on Kids! clickAndWait @@ -2657,7 +2685,17 @@ verifyElementPresent - link=Kids Now! + link=Focus on Kids Project + + + + verifyElementPresent + link=Focus on Kids! + + + + verifyElementPresent + link=Focus on Kids Too! @@ -2870,7 +2908,12 @@ click - //div[@id='wrapper-content']/ul/li[6] + //div[@id='wrapper-content']/ul/li[4] + + + + pause + 5000 diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html index 176ca609..24b73402 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html @@ -1024,7 +1024,7 @@ click - css=li.nonSelectedGroupTab.clickable + //div[@id='wrapper-content']/ul/li[10] @@ -1047,11 +1047,6 @@ Ape Health Program Founder 1993 - - - click - //div[@id='wrapper-content']/ul/li[6] - - verifyElementPresent link=History of Apes in Africa @@ -1072,11 +1067,6 @@ Habitats for Apes Researcher 1980 - 1985 - - click - //div[@id='wrapper-content']/ul/li[8] - - verifyElementPresent link=Working with Primates diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html index b34cc783..03d71ebd 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html @@ -105,8 +105,23 @@ type id=grant + + + + sendKeys + id=grant Future of + + pause + 5000 + + + + sendKeys + id=grant + ${KEY_DOWN} + click ui-active-menuitem @@ -176,8 +191,23 @@ type id=grant + + + + sendKeys + id=grant Nix N + + pause + 5000 + + + + sendKeys + id=grant + ${KEY_DOWN} + click ui-active-menuitem @@ -241,8 +271,23 @@ type id=grant + + + + sendKeys + id=grant Nix N + + pause + 5000 + + + + sendKeys + id=grant + ${KEY_DOWN} + click ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html index e00e5b4f..2fc0065a 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html @@ -383,7 +383,7 @@ verifyTextPresent - from 2002 through 2012 + from 2004 through 2013 @@ -398,7 +398,7 @@ verifyTextPresent - from 2003 through 2012 + from 2004 through 2013 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index ee215155..a4949d70 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -134,8 +134,23 @@ type id=person + + + + sendKeys + id=person Furter + + pause + 5000 + + + + sendKeys + id=person + ${KEY_DOWN} + click id=ui-active-menuitem @@ -184,8 +199,23 @@ type id=person + + + + sendKeys + id=person John + + pause + 5000 + + + + sendKeys + id=person + ${KEY_DOWN} + click id=ui-active-menuitem @@ -234,7 +264,22 @@ type id=person - smith + + + + sendKeys + id=person + Smith + + + pause + 5000 + + + + sendKeys + id=person + ${KEY_DOWN} click @@ -284,7 +329,22 @@ type id=person - zink + + + + sendKeys + id=person + Zink + + + pause + 5000 + + + + sendKeys + id=person + ${KEY_DOWN} click @@ -363,6 +423,11 @@ link=Organizations + + pause + 5000 + + assertTitle Organizations @@ -622,10 +687,15 @@ - selectAndWait + select //div[@id='leftUpper']/div/select label=by Grants + + pause 10000 + + + assertTitle Child Development - Temporal Graph Visualization @@ -919,6 +989,11 @@ link=Organizations + + pause + 5000 + + assertTitle Organizations @@ -949,6 +1024,11 @@ id=organizationMoniker + + pause + 5000 + + verifyTextPresent College of Human Ecology diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html index 4adf2a38..3c46c6ec 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html @@ -177,6 +177,11 @@ Assistant Professor + + pause + 5000 + + verifyElementPresent link=Librarian, Lily Lou diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 8fe28bba..c5c972af 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -167,13 +167,18 @@ - clickAndWait - id=showAddForm + assertConfirmation + Are you sure you want to remove this web page? - assertTitle - Edit + waitForPageToLoad + 5000 + + + + clickAndWait + id=showAddForm @@ -822,26 +827,6 @@ Faculty, Jane - - clickAndWait - css=a.delete-relatedBy > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - clickAndWait css=#backgroundGroup > article.property > #relatedBy > a.add-relatedBy > img.add-individual diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html index 88030d1f..a6bbe1ad 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html @@ -219,8 +219,23 @@ type id=org + + + + sendKeys + id=org Carr + + pause + 5000 + + + + sendKeys + id=org + ${KEY_DOWN} + click id=ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html index ce8cc7b4..92b65533 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html @@ -211,7 +211,7 @@ clickAndWait - xpath=(//img[@alt='edit this entry'])[5] + xpath=(//img[@alt='edit this entry'])[4] @@ -290,10 +290,15 @@ link=Primates-R-Us - + + + selectWindow + null + + clickAndWait - xpath=(//img[@alt='edit this entry'])[5] + css=a.edit-relatedBy > img.edit-individual diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index 612c1500..45943ee9 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html @@ -303,12 +303,12 @@ verifyTextPresent - Version rel-1.6.1-rc2 + Version rel-1.6.1-rc4 verifyElementPresent - link=rel-1.6.1-rc2 + link=rel-1.6.1-rc4 @@ -532,7 +532,7 @@ verifyTextPresent - Version rel-1.6.1-rc2 + Version rel-1.6.1-rc4 @@ -639,12 +639,12 @@ verifyTextPresent - Version rel-1.6.1-rc2 + Version rel-1.6.1-rc4 verifyElementPresent - link=rel-1.6.1-rc2 + link=rel-1.6.1-rc4 diff --git a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html index 0150889b..e4183db2 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html +++ b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html @@ -131,12 +131,42 @@ Test HTML Page - + clickAndWait xpath=(//img[@alt='delete this page'])[2] + + assertConfirmation + Are you sure you wish to delete this page:  Activities? + + + + waitForPageToLoad + 5000 + + + + assertTitle + Pages + + + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + assertTitle Pages @@ -162,6 +192,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[6] @@ -182,6 +232,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[7] @@ -202,6 +272,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[11] diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html index caaf7ed8..11f9de71 100644 --- a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html +++ b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html @@ -143,11 +143,6 @@ OpenSocial - - verifyTextPresent - KNODE Search Results - - clickAndWait diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html index 375e6615..f0af0db6 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html @@ -119,7 +119,7 @@ assertConfirmation - Are you sure you want to delete these accounts?? + Are you sure you want to delete this account?? @@ -150,7 +150,7 @@ assertConfirmation - Are you sure you want to delete these accounts?? + Are you sure you want to delete this account?? @@ -176,7 +176,7 @@ assertConfirmation - Are you sure you want to delete these accounts?? + Are you sure you want to delete this account?? diff --git a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html index 6e48c32a..c381211f 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html @@ -123,7 +123,7 @@ sendKeys id=associateProfileName - Facul + Faculty, Ja pause diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html index 7b351b6d..aee17b65 100644 --- a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html +++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html @@ -195,8 +195,23 @@ type id=activity + + + + sendKeys + id=activity Depart + + pause + 5000 + + + + sendKeys + id=activity + ${KEY_DOWN} + click id=ui-active-menuitem @@ -282,8 +297,23 @@ type id=activity + + + + sendKeys + id=activity Depart + + pause + 5000 + + + + sendKeys + id=activity + ${KEY_DOWN} + click id=ui-active-menuitem