diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
index 619740f3..4799ad19 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
@@ -66,12 +66,7 @@
verifyElementPresent |
- link=People (1) |
- |
-
-
- verifyElementPresent |
- link=Activities (4) |
+ link=Activities (5) |
|
@@ -96,42 +91,17 @@
verifyElementPresent |
- link=Research (11) |
+ link=Research (12) |
|
verifyElementPresent |
- link=Locations (318) |
+ link=Locations (321) |
|
click |
- link=People (1) |
- |
-
-
- pause |
- 5000 |
- |
-
-
- assertTitle |
- VIVO |
- |
-
-
- verifyTextPresent |
- Librarian |
- |
-
-
- verifyTextPresent |
- Person |
- |
-
-
- click |
- link=Activities (4) |
+ link=Activities (5) |
|
@@ -149,6 +119,11 @@
Agreement |
|
+
+ verifyTextPresent |
+ Award or Honor Receipt |
+ |
+
verifyTextPresent |
Service |
@@ -261,7 +236,7 @@
click |
- link=Research (11) |
+ link=Research (12) |
|
@@ -284,6 +259,11 @@
Book |
|
+
+ verifyTextPresent |
+ Concept |
+ |
+
verifyTextPresent |
Database |
@@ -299,11 +279,6 @@
Proceedings |
|
-
- verifyTextPresent |
- Subject Area |
- |
-
verifyTextPresent |
Webpage |
@@ -311,7 +286,7 @@
click |
- link=Locations (314) |
+ link=Locations (321) |
|
@@ -356,12 +331,12 @@
verifyTextPresent |
- Geographic Region |
+ Geographic Location |
|
verifyTextPresent |
- Geographic Location |
+ Geographic Region |
|
@@ -385,148 +360,23 @@
|
- click |
+ clickAndWait |
link=People |
|
-
- pause |
- 10000 |
- |
-
-
- assertTitle |
- People |
- |
-
-
- verifyElementPresent |
- link=Librarian (1) |
- |
-
-
- verifyElementPresent |
- link=Person (1) |
- |
-
verifyTextPresent |
- Find By |
+ There is currently no People content in the system |
+ |
+
+
+ verifyTextPresent |
+ You can browse all of the public content currently in the system using the index page. |
|
verifyElementPresent |
- link=Subject Area |
- |
-
-
- verifyElementPresent |
- link=Department |
- |
-
-
- verifyElementPresent |
- link=Courses |
- |
-
-
- comment |
-
- |
-
-
- clickAndWait |
- link=Subject Area |
- |
-
-
- assertTitle |
- Subject Area |
- |
-
-
- verifyElementPresent |
- link=Animal Health |
- |
-
-
- verifyElementPresent |
- link=Elderly Care |
- |
-
-
- verifyElementPresent |
- link=Primate Diet |
- |
-
-
- verifyElementPresent |
- link=Primate Health |
- |
-
-
- clickAndWait |
- link=People |
- |
-
-
- assertTitle |
- People |
- |
-
-
- comment |
-
- |
-
-
- clickAndWait |
- link=Department |
- |
-
-
- assertTitle |
- Department |
- |
-
-
- clickAndWait |
- link=People |
- |
-
-
- assertTitle |
- People |
- |
-
-
- comment |
-
- |
-
-
- clickAndWait |
- link=Courses |
- |
-
-
- assertTitle |
- Course |
- |
-
-
- verifyElementPresent |
- link=Introduction to Primate Health |
- |
-
-
- clickAndWait |
- link=People |
- |
-
-
- assertTitle |
- People |
+ link=index page |
|
@@ -729,6 +579,11 @@
link=Book (1) |
|
+
+ verifyElementPresent |
+ link=Concept (5) |
+ |
+
verifyElementPresent |
link=Database (1) |
@@ -746,12 +601,7 @@
verifyElementPresent |
- link=Subject Area (4) |
- |
-
-
- verifyTextPresent |
- Webpage (1) |
+ link=Webpage (1) |
|
@@ -769,6 +619,76 @@
link=PHC Proceedings |
|
+
+ verifyTextPresent |
+ Proceedings |
+ |
+
+
+ click |
+ //li[@id='concept']/a |
+ |
+
+
+ pause |
+ 5000 |
+ |
+
+
+ verifyElementPresent |
+ link=Animal Health |
+ |
+
+
+ verifyElementPresent |
+ link=Ape Health |
+ |
+
+
+ verifyElementPresent |
+ link=Elderly Care |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Diet |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
+
+ click |
+ //li[@id='concept']/a |
+ |
+
+
+ pause |
+ 5000 |
+ |
+
+
+ click |
+ link=P |
+ |
+
+
+ pause |
+ 5000 |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Diet |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
click |
//li[@id='database']/a |
@@ -824,36 +744,6 @@
link=PHC Proceedings |
|
-
- click |
- //li[@id='subjectArea']/a |
- |
-
-
- pause |
- 5000 |
- |
-
-
- verifyElementPresent |
- link=Animal Health |
- |
-
-
- verifyElementPresent |
- link=Elderly Care |
- |
-
-
- verifyElementPresent |
- link=Primate Diet |
- |
-
-
- verifyElementPresent |
- link=Primate Health |
- |
-
click |
//li[@id='webpage']/a |
@@ -869,36 +759,6 @@
link=exact:http://primatehealthintro.cornell.edu |
|
-
- click |
- //li[@id='subjectArea']/a |
- |
-
-
- pause |
- 5000 |
- |
-
-
- click |
- link=P |
- |
-
-
- pause |
- 5000 |
- |
-
-
- verifyElementPresent |
- link=Primate Diet |
- |
-
-
- verifyElementPresent |
- link=Primate Health |
- |
-
comment |
@@ -919,6 +779,11 @@
link=Conference (1) |
|
+
+ verifyElementPresent |
+ link=Event (4) |
+ |
+
verifyElementPresent |
link=Invited Talk (1) |
@@ -944,6 +809,51 @@
link=Primate Health Conference |
|
+
+ click |
+ //li[@id='event']/a |
+ |
+
+
+ pause |
+ 5000 |
+ |
+
+
+ verifyElementPresent |
+ link=Introduction to Primate Health |
+ |
+
+
+ verifyTextPresent |
+ Course |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health and Fitness |
+ |
+
+
+ verifyTextPresent |
+ Invited Talk |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Check |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Conference |
+ |
+
+
+ verifyTextPresent |
+ Conference |
+ |
+
click |
//li[@id='invitedTalk']/a |
@@ -974,6 +884,11 @@
link=Primate Health and Fitness |
|
+
+ verifyTextPresent |
+ Invited Talk |
+ |
+
click |
//li[@id='conference']/a |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
index d83ac863..2b1bf218 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
@@ -69,11 +69,6 @@
Verify headings appear |
|
-
- verifyTextPresent |
- people |
- |
-
verifyTextPresent |
activities |
@@ -114,21 +109,16 @@
Verify counts correct |
|
-
- verifyTextPresent |
- Librarian (1) |
- |
-
-
- verifyTextPresent |
- Person (1) |
- |
-
verifyTextPresent |
Agreement (3) |
|
+
+ verifyTextPresent |
+ Award or Honor Receipt (1) |
+ |
+
verifyTextPresent |
Service (1) |
@@ -144,6 +134,11 @@
Conference (1) |
|
+
+ verifyTextPresent |
+ Event (4) |
+ |
+
verifyTextPresent |
Invited Talk (1) |
@@ -184,11 +179,21 @@
Equipment (2) |
|
+
+ verifyTextPresent |
+ Award or Honor (1) |
+ |
+
verifyTextPresent |
Book (1) |
|
+
+ verifyTextPresent |
+ Concept (5) |
+ |
+
verifyTextPresent |
Database (1) |
@@ -209,6 +214,11 @@
Webpage (1) |
|
+
+ verifyTextPresent |
+ Address (1) |
+ |
+
verifyTextPresent |
Building (1) |
@@ -234,36 +244,21 @@
Room (1) |
|
-
- verifyTextPresent |
- State Or Province (50) |
- |
-
-
- verifyTextPresent |
- Transnational Region (27) |
- |
-
comment |
Verify links correct |
|
-
- verifyElementPresent |
- link=Librarian |
- |
-
-
- verifyElementPresent |
- link=Person |
- |
-
verifyElementPresent |
link=Agreement |
|
+
+ verifyElementPresent |
+ link=Award or Honor Receipt |
+ |
+
verifyElementPresent |
link=Service |
@@ -279,6 +274,11 @@
link=Conference |
|
+
+ verifyElementPresent |
+ link=Event |
+ |
+
verifyElementPresent |
link=Invited Talk |
@@ -319,6 +319,11 @@
link=Equipment |
|
+
+ verifyElementPresent |
+ link=Award or Honor |
+ |
+
verifyElementPresent |
link=Book |
@@ -329,6 +334,11 @@
link=Concept |
|
+
+ verifyElementPresent |
+ link=Database |
+ |
+
verifyElementPresent |
link=Grant |
@@ -344,6 +354,11 @@
link=Webpage |
|
+
+ verifyElementPresent |
+ link=Address |
+ |
+
verifyElementPresent |
link=Building |
@@ -351,12 +366,12 @@
verifyElementPresent |
- link=Country |
+ link=Campus |
|
verifyElementPresent |
- link=Geographic Location |
+ link=Facility |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
index fa24aa13..9cf30fe0 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
@@ -91,12 +91,12 @@
verifyTextPresent |
- related role |
+ Background |
|
verifyTextPresent |
- clinical role |
+ contributor |
|
@@ -139,6 +139,26 @@
Introduction to Primate Health |
|
+
+ verifyTextPresent |
+ Overview |
+ |
+
+
+ verifyTextPresent |
+ includes event |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Check |
+ |
+
+
+ verifyTextPresent |
+ Primate Health Check |
+ |
+
verifyTextPresent |
offered by |
@@ -154,6 +174,21 @@
Primate College of America |
|
+
+ verifyTextPresent |
+ has subject area |
+ |
+
+
+ verifyElementPresent |
+ link=Animal Health |
+ |
+
+
+ verifyTextPresent |
+ Animal Health |
+ |
+
verifyTextPresent |
description |
@@ -189,6 +224,11 @@
ME Tarzan at metarzan@primates.edu or 555-555-5553 |
|
+
+ verifyTextPresent |
+ Research |
+ |
+
verifyTextPresent |
geographic focus |
@@ -204,6 +244,11 @@
Africa |
|
+
+ verifyTextPresent |
+ Location |
+ |
+
verifyTextPresent |
has geographic location |
@@ -219,6 +264,11 @@
Liberia |
|
+
+ verifyTextPresent |
+ Time |
+ |
+
verifyTextPresent |
date/time interval |
@@ -229,6 +279,11 @@
September 1, 2007 - December 15, 2007 |
|
+
+ verifyTextPresent |
+ Additional Document Info |
+ |
+
verifyTextPresent |
related documents |
@@ -244,6 +299,11 @@
http://primatehealthintro.cornell.edu |
|
+
+ verifyTextPresent |
+ Other |
+ |
+
verifyTextPresent |
has prerequisite |
@@ -259,36 +319,6 @@
Introduction to Primate Health |
|
-
- verifyTextPresent |
- subject area |
- |
-
-
- verifyElementPresent |
- link=Animal Health |
- |
-
-
- verifyTextPresent |
- Animal Health |
- |
-
-
- verifyTextPresent |
- includes event |
- |
-
-
- verifyElementPresent |
- link=Primate Health Check |
- |
-
-
- verifyTextPresent |
- Primate Health Check |
- |
-
verifyTextPresent |
credits |
@@ -334,6 +364,36 @@
Primate Health Conference |
|
+
+ verifyTextPresent |
+ includes event |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Check |
+ |
+
+
+ verifyTextPresent |
+ Primate Health Check |
+ |
+
+
+ verifyTextPresent |
+ has subject area |
+ |
+
+
+ verifyElementPresent |
+ link=Animal Health |
+ |
+
+
+ verifyTextPresent |
+ Animal Health |
+ |
+
verifyTextPresent |
description |
@@ -424,36 +484,6 @@
http://primatehealthintro.cornell.edu |
|
-
- verifyTextPresent |
- subject area |
- |
-
-
- verifyElementPresent |
- link=Animal Health |
- |
-
-
- verifyTextPresent |
- Animal Health |
- |
-
-
- verifyTextPresent |
- includes event |
- |
-
-
- verifyElementPresent |
- link=Primate Health Check |
- |
-
-
- verifyTextPresent |
- Primate Health Check |
- |
-
verifyTextPresent |
abbreviation |
@@ -489,6 +519,11 @@
Primate Health and Fitness |
|
+
+ verifyTextPresent |
+ participant |
+ |
+
verifyElementPresent |
link=Primate College of America |
@@ -524,6 +559,16 @@
Primate Health and Fitness |
|
+
+ verifyTextPresent |
+ participant |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America Organizer 2008 |
@@ -694,6 +739,11 @@
has sub-organization |
|
+
+ verifyTextPresent |
+ laboratory |
+ |
+
verifyElementPresent |
link=Primate Research Laboratory |
@@ -904,11 +954,6 @@
mailing address |
|
-
- verifyElementPresent |
- link=1234 Northern African Nation |
- |
-
verifyTextPresent |
1234 Northern African Nation |
@@ -999,21 +1044,6 @@
Primate Elderly Care |
|
-
- verifyTextPresent |
- related role |
- |
-
-
- verifyElementPresent |
- link=Primate College of America |
- |
-
-
- verifyTextPresent |
- Primate College of America Member 2009 - |
- |
-
verifyTextPresent |
subcontracts grant |
@@ -1029,6 +1059,21 @@
Primate Elderly Care |
|
+
+ verifyTextPresent |
+ contributor |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
+
+ verifyTextPresent |
+ Primate College of America 2009 - |
+ |
+
clickAndWait |
link=Index |
@@ -1064,6 +1109,11 @@
has sub-organization |
|
+
+ verifyTextPresent |
+ college |
+ |
+
verifyElementPresent |
link=Primate College of America |
@@ -1186,7 +1236,7 @@
verifyTextPresent |
- related role |
+ contributor |
|
@@ -1394,6 +1444,21 @@
Primate Research Laboratory |
|
+
+ verifyTextPresent |
+ has subject area |
+ |
+
+
+ verifyElementPresent |
+ link=Elderly Care |
+ |
+
+
+ verifyTextPresent |
+ Elderly Care |
+ |
+
verifyTextPresent |
abstract |
@@ -1499,21 +1564,6 @@
Primate Student of the Year |
|
-
- verifyTextPresent |
- subject area |
- |
-
-
- verifyElementPresent |
- link=Elderly Care |
- |
-
-
- verifyTextPresent |
- Elderly Care |
- |
-
clickAndWait |
link=Index |
@@ -1594,11 +1644,21 @@
Primate College of America |
|
+
+ comment |
+
+ |
+
clickAndWait |
link=Index |
|
+
+ comment |
+
+ |
+
clickAndWait |
link=Concept |
@@ -1634,21 +1694,6 @@
Primate Elderly Care |
|
-
- verifyTextPresent |
- related |
- |
-
-
- verifyElementPresent |
- link=Primate Health |
- |
-
-
- verifyTextPresent |
- Primate Health |
- |
-
clickAndWait |
link=Index |
@@ -1656,12 +1701,12 @@
clickAndWait |
- link=Subject Area |
+ link=Concept |
|
assertTitle |
- Subject Area |
+ Concept |
|
@@ -1689,21 +1734,6 @@
Primate Health |
|
-
- verifyTextPresent |
- subject area for |
- |
-
-
- verifyElementPresent |
- link=Primate Feeder |
- |
-
-
- verifyTextPresent |
- Primate Feeder |
- |
-
clickAndWait |
link=Index |
@@ -1711,12 +1741,12 @@
clickAndWait |
- link=Subject Area |
+ link=Concept |
|
assertTitle |
- Subject Area |
+ Concept |
|
@@ -1744,51 +1774,6 @@
Animal Health |
|
-
- verifyTextPresent |
- research area of |
- |
-
-
- verifyElementPresent |
- link=Librarian, Lily |
- |
-
-
- verifyTextPresent |
- Librarian, Lily |
- |
-
-
- verifyTextPresent |
- source vocabulary reference |
- |
-
-
- verifyElementPresent |
- link=Not sure |
- |
-
-
- verifyTextPresent |
- Not sure |
- |
-
-
- verifyTextPresent |
- subject area for |
- |
-
-
- verifyElementPresent |
- link=Introduction to Primate Health |
- |
-
-
- verifyTextPresent |
- Introduction to Primate Health |
- |
-
verifyTextPresent |
narrower term |
@@ -1804,14 +1789,19 @@
Primate Diet |
|
+
+ verifyTextPresent |
+ related |
+ |
+
verifyElementPresent |
- link=Elderly Care |
+ link=Ape Health |
|
verifyTextPresent |
- Elderly Care |
+ Ape Health |
|
@@ -1819,6 +1809,56 @@
link=Index |
|
+
+ clickAndWait |
+ link=Concept |
+ |
+
+
+ assertTitle |
+ Concept |
+ |
+
+
+ clickAndWait |
+ link=Ape Health |
+ |
+
+
+ assertTitle |
+ Ape Health |
+ |
+
+
+ verifyTextPresent |
+ related |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
+
+ verifyTextPresent |
+ Primate Health |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ comment |
+
+ |
+
clickAndWait |
link=Webpage |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
index 94fcc8f3..75d34e50 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
@@ -599,16 +599,6 @@
id=showAddFormButton |
|
-
- type |
- id=searchTerm |
- Elderly Care |
-
-
- click |
- id=searchButton |
- |
-
clickAndWait |
link=exact:Can't find the concept you want? Create your own. |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
index e54cbac5..57623885 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@@ -549,21 +549,6 @@
id=showAddFormButton |
|
-
- type |
- id=searchTerm |
- Animal Health |
-
-
- click |
- id=searchButton |
- |
-
-
- verifyTextPresent |
- No search results found. |
- |
-
clickAndWait |
link=exact:Can't find the concept you want? Create your own. |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index 7cc5cf72..f63ff82f 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -529,16 +529,6 @@
id=showAddFormButton |
|
-
- type |
- id=searchTerm |
- Animal Health |
-
-
- click |
- id=searchButton |
- |
-
clickAndWait |
link=exact:Can't find the concept you want? Create your own. |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
index 60e8b5f1..99b7855e 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
@@ -311,13 +311,13 @@
verifyTextPresent |
- Create "related" entry for Primate Health |
+ Create "related" entry for Primate Health |
|
type |
id=name |
- Elderly Care |
+ Ape Health |
clickAndWait |
@@ -346,7 +346,7 @@
verifyTextPresent |
- Elderly Care |
+ Ape Health |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
index 296a4212..3d0080d9 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
@@ -119,11 +119,6 @@
|
-
- verifyTextPresent |
- people |
- |
-
verifyTextPresent |
activities |
@@ -159,81 +154,6 @@
locations |
|
-
- comment |
-
- |
-
-
- clickAndWait |
- link=Index |
- |
-
-
- clickAndWait |
- link=Librarian |
- |
-
-
- assertTitle |
- Librarian |
- |
-
-
- clickAndWait |
- link=Librarian, Lily |
- |
-
-
- assertTitle |
- Librarian, Lily |
- |
-
-
- clickAndWait |
- link=Edit this individual |
- |
-
-
- assertTitle |
- Individual Control Panel |
- |
-
-
- clickAndWait |
- //input[@value="Edit This Individual"] |
- |
-
-
- assertTitle |
- Individual Editing Form |
- |
-
-
- clickAndWait |
- _delete |
- |
-
-
- assertConfirmation |
- Are you SURE you want to delete this individual? If in doubt, CANCEL. |
- |
-
-
- waitForPageToLoad |
- 5000 |
- |
-
-
- assertTitle |
- VIVO Site Administration |
- |
-
-
- clickAndWait |
- link=Index |
- |
-
comment |
@@ -694,6 +614,76 @@
link=Index |
|
+
+ clickAndWait |
+ link=Event |
+ |
+
+
+ assertTitle |
+ Event |
+ |
+
+
+ clickAndWait |
+ link=Primate Health Check |
+ |
+
+
+ assertTitle |
+ Primate Health Check |
+ |
+
+
+ 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 |
+ 10000 |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
comment |
@@ -1164,6 +1154,76 @@
|
+
+ clickAndWait |
+ link=Award or Honor |
+ |
+
+
+ assertTitle |
+ Award or Honor |
+ |
+
+
+ clickAndWait |
+ link=Primate Student of the Year |
+ |
+
+
+ assertTitle |
+ Primate Student of the Year |
+ |
+
+
+ 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=Book |
@@ -1231,77 +1291,12 @@
clickAndWait |
- link=Database |
+ link=Concept |
|
assertTitle |
- Database |
- |
-
-
- clickAndWait |
- link=Primate Info |
- |
-
-
- assertTitle |
- Primate Info |
- |
-
-
- clickAndWait |
- link=Edit this individual |
- |
-
-
- assertTitle |
- Individual Control Panel |
- |
-
-
- clickAndWait |
- //input[@value="Edit This Individual"] |
- |
-
-
- assertTitle |
- Individual Editing Form |
- |
-
-
- clickAndWait |
- _delete |
- |
-
-
- assertConfirmation |
- Are you SURE you want to delete this individual? If in doubt, CANCEL. |
- |
-
-
- waitForPageToLoad |
- 5000 |
- |
-
-
- assertTitle |
- VIVO Site Administration |
- |
-
-
- clickAndWait |
- link=Index |
- |
-
-
- clickAndWait |
- link=Subject Area |
- |
-
-
- assertTitle |
- Subject Area |
+ Concept |
|
@@ -1326,7 +1321,7 @@
clickAndWait |
- //input[@value="Edit This Individual"] |
+ //input[@value='Edit This Individual'] |
|
@@ -1335,8 +1330,8 @@
|
- clickAndWait |
- _delete |
+ click |
+ name=_delete |
|
@@ -1359,14 +1354,89 @@
link=Index |
|
+
+ assertTitle |
+ Index of Contents |
+ |
+
clickAndWait |
- link=Subject Area |
+ link=Concept |
|
assertTitle |
- Subject Area |
+ Concept |
+ |
+
+
+ clickAndWait |
+ link=Ape Health |
+ |
+
+
+ assertTitle |
+ Ape Health |
+ |
+
+
+ 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=Concept |
+ |
+
+
+ assertTitle |
+ Concept |
|
@@ -1391,7 +1461,7 @@
clickAndWait |
- //input[@value="Edit This Individual"] |
+ //input[@value='Edit This Individual'] |
|
@@ -1400,8 +1470,8 @@
|
- clickAndWait |
- _delete |
+ click |
+ name=_delete |
|
@@ -1424,14 +1494,19 @@
link=Index |
|
+
+ assertTitle |
+ Index of Contents |
+ |
+
clickAndWait |
- link=Subject Area |
+ link=Concept |
|
assertTitle |
- Subject Area |
+ Concept |
|
@@ -1456,7 +1531,7 @@
clickAndWait |
- //input[@value="Edit This Individual"] |
+ //input[@value='Edit This Individual'] |
|
@@ -1465,8 +1540,8 @@
|
- clickAndWait |
- _delete |
+ click |
+ name=_delete |
|
@@ -1489,14 +1564,19 @@
link=Index |
|
+
+ assertTitle |
+ Index of Contents |
+ |
+
clickAndWait |
- link=Subject Area |
+ link=Concept |
|
assertTitle |
- Subject Area |
+ Concept |
|
@@ -1519,6 +1599,76 @@
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=Database |
+ |
+
+
+ assertTitle |
+ Database |
+ |
+
+
+ clickAndWait |
+ link=Primate Info |
+ |
+
+
+ assertTitle |
+ Primate Info |
+ |
+
+
+ clickAndWait |
+ link=Edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
clickAndWait |
//input[@value="Edit This Individual"] |
@@ -1624,6 +1774,76 @@
|
+
+ clickAndWait |
+ link=Address |
+ |
+
+
+ assertTitle |
+ Address |
+ |
+
+
+ clickAndWait |
+ link=1234 Northern African Nation |
+ |
+
+
+ assertTitle |
+ 1234 Northern African Nation |
+ |
+
+
+ clickAndWait |
+ link=Edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ clickAndWait |
+ //input[@value='Edit This Individual'] |
+ |
+
+
+ assertTitle |
+ Individual Editing Form |
+ |
+
+
+ clickAndWait |
+ 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=Building |
@@ -1754,146 +1974,6 @@
link=Index |
|
-
- clickAndWait |
- link=Event |
- |
-
-
- assertTitle |
- Event |
- |
-
-
- clickAndWait |
- link=Primate Health Check |
- |
-
-
- assertTitle |
- Primate Health Check |
- |
-
-
- clickAndWait |
- link=Edit this individual |
- |
-
-
- assertTitle |
- Individual Control Panel |
- |
-
-
- clickAndWait |
- //input[@value="Edit This Individual"] |
- |
-
-
- assertTitle |
- Individual Editing Form |
- |
-
-
- click |
- _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=Award or Honor |
- |
-
-
- assertTitle |
- Award or Honor |
- |
-
-
- clickAndWait |
- link=Primate Student of the Year |
- |
-
-
- assertTitle |
- Primate Student of the Year |
- |
-
-
- clickAndWait |
- link=Edit this individual |
- |
-
-
- assertTitle |
- Individual Control Panel |
- |
-
-
- clickAndWait |
- //input[@value="Edit This Individual"] |
- |
-
-
- assertTitle |
- Individual Editing Form |
- |
-
-
- click |
- _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=Campus |
@@ -2039,76 +2119,6 @@
Index of Contents |
|
-
- clickAndWait |
- link=Address |
- |
-
-
- assertTitle |
- Address |
- |
-
-
- clickAndWait |
- link=1234 Northern African Nation |
- |
-
-
- assertTitle |
- 1234 Northern African Nation |
- |
-
-
- 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 |
- |
-
comment |
@@ -2214,6 +2224,11 @@
Building |
|
+
+ verifyTextNotPresent |
+ Campus |
+ |
+
verifyTextNotPresent |
Room |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/RebuildSearchIndex.html b/utilities/acceptance-tests/suites/AddNonPersonThings/RebuildSearchIndex.html
new file mode 100644
index 00000000..19bccbaa
--- /dev/null
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/RebuildSearchIndex.html
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+RebuildSearchIndex
+
+
+
+
+
+RebuildSearchIndex |
+
+
+ comment |
+
+ |
+
+
+ deleteAllVisibleCookies |
+ |
+ |
+
+
+ open |
+ /vivo/ |
+ |
+
+
+ assertTitle |
+ VIVO |
+ |
+
+
+ clickAndWait |
+ link=Log in |
+ |
+
+
+ assertTitle |
+ Log in to VIVO |
+ |
+
+
+ type |
+ id=loginName |
+ testAdmin@cornell.edu |
+
+
+ type |
+ id=loginPassword |
+ Password |
+
+
+ clickAndWait |
+ name=loginForm |
+ |
+
+
+ assertTitle |
+ VIVO |
+ |
+
+
+ clickAndWait |
+ link=Site Admin |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Rebuild search index |
+ |
+
+
+ assertTitle |
+ Rebuild Search Index |
+ |
+
+
+ clickAndWait |
+ name=rebuild |
+ |
+
+
+ assertTitle |
+ Rebuild Search Index |
+ |
+
+
+ waitForTextPresent |
+ Reset the search index and re-populate it. |
+ |
+
+
+ clickAndWait |
+ link=Log out |
+ |
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
index f272e047..149dc172 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
@@ -234,11 +234,6 @@
selectClassGroup |
label=courses |
-
- click |
- css=option[value=http://vivoweb.org/ontology#vitroClassGroupcourses] |
- |
-
click |
submit-Add |
@@ -494,16 +489,31 @@
link=Primate Elderly Care |
|
+
+ verifyTextPresent |
+ Grant |
+ |
+
verifyElementPresent |
link=Primate Habitat Research Grant |
|
+
+ verifyTextPresent |
+ Grant |
+ |
+
verifyElementPresent |
link=Primate Survival Planning Grant |
|
+
+ verifyTextPresent |
+ Grant |
+ |
+
click |
link=Service (1) |
@@ -679,11 +689,21 @@
link=Jane Memorial Building |
|
+
+ verifyTextPresent |
+ Building |
+ |
+
verifyElementPresent |
link=Lab Admin Office |
|
+
+ verifyTextPresent |
+ Room |
+ |
+
verifyElementPresent |
link=Primate Research Lab Room 123 |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
index 1f3e4728..cbf09939 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
@@ -74,11 +74,6 @@
primates - VIVO Search Results |
|
-
- verifyElementPresent |
- link=people |
- |
-
verifyElementPresent |
link=activities |
@@ -149,11 +144,6 @@
Primate Health and Fitness Invited Talk |
|
-
- verifyTextPresent |
- Introduction to Primate Health Course |
- |
-
verifyTextPresent |
Primate Colleges of the World Consortium |
@@ -179,6 +169,11 @@
Primate Health Check Event |
|
+
+ verifyTextPresent |
+ Introduction to Primate Health Course |
+ |
+
verifyTextPresent |
Primate Health Conference Conference |
@@ -199,6 +194,11 @@
Portable Primate Habitat Equipment |
|
+
+ verifyTextPresent |
+ Primate Habitat Research Grant Grant |
+ |
+
verifyTextPresent |
Primate Survival Planning Grant Grant |
@@ -209,21 +209,6 @@
Primate Heart Health Clinic Service |
|
-
- clickAndWait |
- link=2 |
- |
-
-
- assertTitle |
- primates - VIVO Search Results |
- |
-
-
- verifyTextPresent |
- Primate Habitat Research Grant Grant |
- |
-
verifyTextPresent |
Primate Research Lab Room 123 Facility |
@@ -236,7 +221,7 @@
verifyTextPresent |
- Elderly Care Concept |
+ Ape Health |
|
@@ -244,6 +229,21 @@
1234 Northern African Nation Address |
|
+
+ verifyTextPresent |
+ Elderly Care Concept |
+ |
+
+
+ clickAndWait |
+ link=2 |
+ |
+
+
+ assertTitle |
+ primates - VIVO Search Results |
+ |
+
verifyTextPresent |
Jane Memorial Building Building |
@@ -266,12 +266,12 @@
verifyTextPresent |
- Congo Country |
+ Africa Continent |
|
verifyTextPresent |
- Africa Continent |
+ Congo Country |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html
index 5ec41e15..af4765a0 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html
@@ -1,26 +1,30 @@
-
-
-
-
-
- Test Suite
-
-
-
-
-
+
+
+
+
+
+ Test Suite
+
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/AddPublications/RebuildSearchIndex.html b/utilities/acceptance-tests/suites/AddPublications/RebuildSearchIndex.html
index f2c12c32..19bccbaa 100644
--- a/utilities/acceptance-tests/suites/AddPublications/RebuildSearchIndex.html
+++ b/utilities/acceptance-tests/suites/AddPublications/RebuildSearchIndex.html
@@ -29,6 +29,16 @@
RebuildSearchIndex |
+
+ comment |
+
+ |
+
+
+ deleteAllVisibleCookies |
+ |
+ |
+
open |
/vivo/ |
@@ -101,7 +111,7 @@
waitForTextPresent |
- Reset the search index and re-populate it. |
+ Reset the search index and re-populate it. |
|
@@ -109,7 +119,6 @@
link=Log out |
|
-