diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html index 27eaf0ab..fab5d8aa 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyClassAutolink.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -94,6 +94,16 @@ Navigate to Tab Management + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + clickAndWait link=Tab management diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html index 4ed2ec62..3ea2000d 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html index 8e048f87..0caa9d2d 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html index bce2efb0..09e1316c 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyPosition.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html index 9cb810b3..c8f413b0 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AssociateLibToFac.html index 9aa0a263..d809dec3 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AssociateLibToFac.html @@ -86,12 +86,17 @@ assertTitle - VIVO Site Administration + VIVO clickAndWait - link=Class hierarchy + link=Site Admin + + + + assertTitle + VIVO Site Administration @@ -99,6 +104,11 @@ Navigate to the core:Librarian in the ontology + + clickAndWait + link=Class hierarchy + + assertTitle Class Hierarchy diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/BrowseIndex.html b/utilities/acceptance-tests/suites/CreatePeopleVB/BrowseIndex.html index b0579317..ca0b748a 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/BrowseIndex.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/BrowseIndex.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html index f87a5d52..5120ac2a 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html @@ -91,7 +91,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeLibrarianImage.html index 8e5f1869..15c3c481 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeLibrarianImage.html @@ -91,7 +91,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html b/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html index cf374de7..9deaec2c 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/CheckPeopleLinks.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html index dba275ee..ac82edc2 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html @@ -114,6 +114,96 @@ //input[@value='Add individual of this class'] + + comment + Validate adding individual + + + + clickAndWait + link=Cancel + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + //input[@value='Add individual of this class'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Edit + + + + verifyTextPresent + This field must not be empty. + + + + type + firstName + Jane + + + type + lastName + + + + clickAndWait + submit + + + + assertTitle + Edit + + + + verifyTextPresent + This field must not be empty. + + + + type + firstName + + + + type + lastName + Faculty + + + clickAndWait + submit + + + + assertTitle + Edit + + + + verifyTextPresent + This field must not be empty. + + comment Add Jane Faculty @@ -181,7 +271,7 @@ comment - Verify that account was created + Verify that Jane Faculty was created @@ -261,7 +351,7 @@ clickAndWait - submit + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html index 74d9a086..6f4ea88d 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html @@ -84,6 +84,16 @@ loginForm + + assertTitle + VIVO + + + + clickAndWait + link=Site Admin + + assertTitle VIVO Site Administration @@ -176,7 +186,7 @@ comment - Verify that individual was added sucessfully + Verify that librarian was added sucessfully @@ -266,7 +276,7 @@ clickAndWait - submit + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html index d8587cb1..a34c3b18 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html index a51a4c78..e7773dc9 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html index 36ac2750..119e150e 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html index c84fa28b..d1bc4cf1 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -111,7 +111,7 @@ clickAndWait - submit + //input[@value='Search'] @@ -181,7 +181,7 @@ clickAndWait - submit + //input[@value='Search'] @@ -251,7 +251,7 @@ clickAndWait - submit + //input[@value='Search'] @@ -266,7 +266,7 @@ clickAndWait - submit + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html index e0a0dc7a..23c39dbc 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html @@ -144,46 +144,6 @@ Tabs - - clickAndWait - //div[@id='contentwrap']/div/table/tbody/tr[3]/td[2]/a - - - - assertTitle - Tab Control Panel - - - - clickAndWait - //input[@value='Edit Tab Details'] - - - - assertTitle - Tab Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this record? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - Tabs - - clickAndWait link=Librarians diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html index 991791c3..2a0d2bd9 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/SearchPeople.html b/utilities/acceptance-tests/suites/CreatePeopleVB/SearchPeople.html index 9ede1070..a7ddeaa8 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/SearchPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/SearchPeople.html @@ -41,12 +41,12 @@ type - search + querytext jane clickAndWait - submit + //input[@value='Search'] @@ -81,12 +81,12 @@ type - search + querytext faculty clickAndWait - submit + //input[@value='Search'] @@ -121,12 +121,12 @@ type - search + querytext jane faculty clickAndWait - submit + //input[@value='Search'] @@ -161,12 +161,12 @@ type - search + querytext lily clickAndWait - submit + //input[@value='Search'] @@ -201,12 +201,12 @@ type - search + querytext librarian clickAndWait - submit + //input[@value='Search'] @@ -241,12 +241,12 @@ type - search + querytext lily librarian clickAndWait - submit + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/SetDefaultTheme.html b/utilities/acceptance-tests/suites/CreatePeopleVB/SetDefaultTheme.html index 20cb4e47..b6ad4ef0 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/SetDefaultTheme.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/SetDefaultTheme.html @@ -102,7 +102,7 @@ select ThemeDir - label=vivo-basic + label=wilma clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/SetupTestTabs.html b/utilities/acceptance-tests/suites/CreatePeopleVB/SetupTestTabs.html index b589cf07..424ca654 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/SetupTestTabs.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/SetupTestTabs.html @@ -74,6 +74,16 @@ loginForm + + assertTitle + VIVO + + + + clickAndWait + link=Site Admin + + assertTitle VIVO Site Administration diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html index e78ebc44..c4a75812 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html @@ -91,7 +91,7 @@ assertTitle - VIVO Site Administration + VIVO diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadLibrarianImage.html index 3c79b105..90f79fe6 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadLibrarianImage.html @@ -91,7 +91,7 @@ assertTitle - VIVO Site Administration + VIVO