diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html b/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html index 3a24095f..dec8eb65 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html @@ -141,7 +141,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html b/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html index 1ba3e9d4..6d6f5504 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html @@ -141,7 +141,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html b/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html index b7861e19..fc45f13b 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html @@ -141,7 +141,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html b/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html index 8856b3c1..edf92c4b 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html @@ -141,7 +141,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html index 0553ebb3..ffc74cae 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html @@ -156,7 +156,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -221,7 +221,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -291,7 +291,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -356,7 +356,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html index 3daec7a2..285dd5f4 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html @@ -161,7 +161,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -236,7 +236,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html index d362b66a..bc7546f9 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html @@ -161,7 +161,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -226,7 +226,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -291,7 +291,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -356,7 +356,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -421,7 +421,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -486,7 +486,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -551,7 +551,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html index d1d57460..3580b9f7 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html @@ -89,6 +89,21 @@ loginForm + + comment + rebuild the search index in case any crud left from previous tests + + + + open + /vivo/SearchIndex + + + + pause + 5000 + + clickAndWait link=Site Admin diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html index 6408b450..89517c8f 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html @@ -241,7 +241,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -311,7 +311,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -381,7 +381,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -451,7 +451,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -521,7 +521,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -591,7 +591,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -661,7 +661,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -731,7 +731,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -806,7 +806,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -881,7 +881,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -951,7 +951,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1021,7 +1021,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1091,7 +1091,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1166,7 +1166,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1236,7 +1236,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1306,7 +1306,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1376,7 +1376,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1446,7 +1446,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1516,7 +1516,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1581,7 +1581,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1651,7 +1651,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html index b96c956b..05580504 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html @@ -136,7 +136,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html index 84906abe..d2c028bd 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html @@ -136,7 +136,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html index 76fb5aa4..f6e55ee5 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html @@ -41,7 +41,7 @@ setTimeout - 10000000 + 10000 @@ -96,7 +96,7 @@ verifyTextPresent - Please enter your password. + Please fill out this field. diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html index 8bbfed6a..d485bf7f 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html @@ -161,7 +161,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -226,7 +226,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -291,7 +291,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -356,7 +356,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -426,7 +426,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -496,7 +496,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -566,7 +566,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -631,7 +631,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -691,7 +691,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -756,7 +756,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -821,7 +821,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -886,7 +886,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -951,7 +951,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -991,52 +991,7 @@ pause - 50000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 + 5000 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html index 599fd827..8b698b67 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html @@ -146,7 +146,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -216,7 +216,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -286,7 +286,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -326,102 +326,7 @@ pause - 50000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 + 5000 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html index 2d189f32..228d7e14 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html @@ -166,7 +166,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -211,102 +211,7 @@ pause - 50000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 - - - - refreshAndWait - 20000 + 5000 diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html index 52742b0d..c64dde8b 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html +++ b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html @@ -36,7 +36,7 @@ setTimeout - 10000000 + 10000 diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html index 50134016..9dd5fdcd 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html +++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html @@ -171,7 +171,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/CreateClasses/Suite.html b/utilities/acceptance-tests/suites/CreateClasses/Suite.html index db6d2c04..eebd40b2 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/Suite.html +++ b/utilities/acceptance-tests/suites/CreateClasses/Suite.html @@ -1,22 +1,22 @@ - - - - - - Test Suite - - - - - - - - - - - - - -
Test Suite
AddClassGroupTimes
AddSubClassHours
AddSubClassMinutes
AddIndividualInHours
DeleteSubClassMinutes
ViewClassHierarchy
DeleteIndividualInHours
DeleteSubClassHours
DeleteClassGroupTimes
- - + + + + + + Test Suite + + + + + + + + + + + + + +
Test Suite
AddClassGroupTimes
AddSubClassHours
AddSubClassMinutes
AddIndividualInHours
DeleteSubClassMinutes
ViewClassHierarchy
DeleteIndividualInHours
DeleteSubClassHours
DeleteClassGroupTimes
+ + diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html index 8cdec18c..2913c394 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html @@ -236,7 +236,7 @@ assertTitle - Crop Photo for Faculty, Jane + Replace image for Faculty, Jane diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index cb26cbdd..23045b66 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -1461,7 +1461,7 @@ clickAndWait - link=Edit this individual + link="Edit this individual" @@ -1471,7 +1471,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1541,7 +1541,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1611,7 +1611,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1681,7 +1681,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1751,7 +1751,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1821,7 +1821,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1891,7 +1891,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -1956,7 +1956,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -2021,7 +2021,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html index 2d43bc3f..96f9ce82 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html @@ -141,7 +141,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -211,7 +211,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html index d2756e52..0de24691 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html @@ -272,7 +272,7 @@ type datafile - C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane1.jpg + /Users/jc55/tomcat/webapps/vivo/utilities/acceptance-tests/suites/CreatePeople/Jane1.jpg clickAndWait @@ -281,7 +281,7 @@ assertTitle - Crop Photo for Faculty, Jane + Photo Upload diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html b/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html index d13a47a5..0b95eb95 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html @@ -41,7 +41,7 @@ setTimeout - 10000000 + 10000 diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html index 1daa8e07..60cd9c42 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html @@ -146,7 +146,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 451a1c3e..55bf7b83 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -271,7 +271,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -311,7 +311,7 @@ assertTitle - Search for 'carroll college' + carroll college - VIVO Search Results @@ -346,7 +346,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -431,7 +431,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -471,7 +471,7 @@ assertTitle - Search for 'carroll university' + carroll university - VIVO Search Results diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html index f75c97d1..9d899d7a 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html @@ -126,7 +126,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html index dffdae20..1ce94bf0 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html @@ -226,7 +226,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -286,7 +286,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] @@ -346,7 +346,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html index 186ede13..50ef13b0 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html @@ -126,7 +126,7 @@ clickAndWait - //input[@value="Edit This Individual's Datatype Properties"] + //input[@value="Edit This Individual"] diff --git a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html index 9ff502d7..2eda4779 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html +++ b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html @@ -281,7 +281,7 @@ verifyTextPresent - Only display within my institution + Only display activities within my institution diff --git a/utilities/acceptance-tests/suites/SPARQLQueries/TestDefaultQuery.html b/utilities/acceptance-tests/suites/SPARQLQueries/TestDefaultQuery.html index 22ac33d6..17541a7e 100644 --- a/utilities/acceptance-tests/suites/SPARQLQueries/TestDefaultQuery.html +++ b/utilities/acceptance-tests/suites/SPARQLQueries/TestDefaultQuery.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + Log in to VIVO @@ -71,7 +71,7 @@ type - username + loginName testAdmin@cornell.edu @@ -81,7 +81,12 @@ clickAndWait - loginSubmitMode + loginForm + + + + clickAndWait + link=Site Admin @@ -131,7 +136,7 @@ verifyTextPresent - <http://aims.fao.org/aos/geopolitical.owl#Antarctica> + <http://aims.fao.org/aos/geopolitical.owl#Kyrgyzstan> @@ -141,7 +146,7 @@ verifyTextPresent - "western Asia"^^<http://www.w3.org/2001/XMLSchema#string> + "Kyrgyzstan"^^<http://www.w3.org/2001/XMLSchema#string> @@ -169,7 +174,6 @@ VIVO -