diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
index cf2eb17d..ac1d5b5c 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
@@ -136,12 +136,12 @@
verifyTextPresent |
- Create head of entry for Librarian, Lily |
+ Create leadership entry for Librarian, Lily |
|
verifyTextPresent |
- Head Of |
+ Organization Type |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/suite.html b/utilities/acceptance-tests/suites/AddRoles/suite.html
index 8c0464b2..49b02c6a 100644
--- a/utilities/acceptance-tests/suites/AddRoles/suite.html
+++ b/utilities/acceptance-tests/suites/AddRoles/suite.html
@@ -1,31 +1,29 @@
-
-
-
-
-
- Test Suite
-
-
-
+
+
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
index 9b37f1d9..e92869e1 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
@@ -184,6 +184,16 @@
Edit |
|
+
+ clickAndWait |
+ id=showAddForm |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
type |
url |
@@ -199,11 +209,6 @@
submit |
|
-
- clickAndWait |
- returnToIndividual |
- |
-
assertTitle |
Faculty, Jane |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
index ba86017a..51c07bba 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
@@ -344,24 +344,9 @@
Edit |
|
-
- click |
- link=Delete |
- |
-
-
- assertConfirmation |
- Are you sure you want to remove this web page? |
- |
-
-
- waitForPageToLoad |
- 5000 |
- |
-
clickAndWait |
- returnToIndividual |
+ id=returnToIndividual |
|
@@ -1661,12 +1646,12 @@
clickAndWait |
- link=Subject Area |
+ link=Concept |
|
assertTitle |
- Subject Area |
+ Concept |
|
@@ -1731,12 +1716,12 @@
clickAndWait |
- link=Subject Area |
+ link=Concept |
|
assertTitle |
- Subject Area |
+ Concept |
|
@@ -1801,12 +1786,12 @@
clickAndWait |
- link=Subject Area |
+ link=Concept |
|
assertTitle |
- Subject Area |
+ Concept |
|
@@ -2059,6 +2044,136 @@
VIVO Site Administration |
|
+
+ type |
+ name=querytext |
+ jungle |
+
+
+ clickAndWait |
+ css=input.search |
+ |
+
+
+ assertTitle |
+ jungle - VIVO Search Results |
+ |
+
+
+ clickAndWait |
+ link=Jungle 1234, Africa, 1234-56789 |
+ |
+
+
+ assertTitle |
+ Jungle 1234, Africa, 1234-56789 |
+ |
+
+
+ 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 |
+ |
+
+
+ type |
+ name=querytext |
+ jungle |
+
+
+ clickAndWait |
+ css=input.search |
+ |
+
+
+ assertTitle |
+ jungle - VIVO Search Results |
+ |
+
+
+ clickAndWait |
+ link=The Jungle, Africa, 12345678 |
+ |
+
+
+ assertTitle |
+ The Jungle, Africa, 12345678 |
+ |
+
+
+ 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 |
+ |
+
comment |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
index 4e073d0e..6d441544 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
@@ -166,7 +166,7 @@
verifyTextPresent |
- Faculty Member (1) |
+ Faculty Member (2) |
|
@@ -176,7 +176,7 @@
verifyTextPresent |
- Person (2) |
+ Person (3) |
|
diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
index fce55f2b..a7fbb0a7 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
@@ -189,6 +189,21 @@
css=a.add-webpage > img.add-individual |
|
+
+ click |
+ link=Delete |
+ |
+
+
+ clickAndWait |
+ id=showAddForm |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
type |
url |
@@ -204,11 +219,6 @@
submit |
|
-
- clickAndWait |
- returnToIndividual |
- |
-
assertTitle |
Faculty, Jane |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/Suite.html b/utilities/acceptance-tests/suites/CreatePeople/Suite.html
index 3e347e31..c10cc831 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/Suite.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/Suite.html
@@ -14,6 +14,7 @@
AddFacultyInfo |
EditFacultyInfo |
AddFacultyInfo2 |
+RebuildSearchIndex |
PublicFacultyInfo |
SearchFacultyInfo |
DeleteFacultyInfo |
@@ -32,7 +33,6 @@
DeleteLibtoFacAssociation |
DeleteTestPeople |
UploadNonPersonImage |
-RebuildSearchIndex |