diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
index 438de6c5..73e96171 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
@@ -109,6 +109,11 @@
equipment |
|
+
+ verifyTextPresent |
+ publications |
+ |
+
verifyTextPresent |
locations |
@@ -214,6 +219,11 @@
Equipment (2) |
|
+
+ verifyTextPresent |
+ Webpage (1) |
+ |
+
verifyTextPresent |
Building (1) |
@@ -334,6 +344,11 @@
link=Equipment |
|
+
+ verifyElementPresent |
+ link=Webpage |
+ |
+
verifyElementPresent |
link=Building |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
index 1b652681..70dd00be 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
@@ -109,6 +109,46 @@
Introduction to Primate Health | Course |
|
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index to VIVO Contents |
+ |
+
+
+ clickAndWait |
+ link=Librarian |
+ |
+
+
+ assertTitle |
+ Librarian |
+ |
+
+
+ verifyElementPresent |
+ link=Librarian, Lily |
+ |
+
+
+ verifyTextPresent |
+ Librarian, Lily | Assistant Librarian |
+ |
+
+
+ clickAndWait |
+ link=Librarian, Lily |
+ |
+
+
+ assertTitle |
+ Librarian, Lily |
+ |
+
comment |
@@ -151,7 +191,7 @@
verifyTextPresent |
- Primate Health and Fitness | Invited Talk |
+ Primate College of America | College |
|
@@ -171,7 +211,7 @@
verifyTextPresent |
- Fall 2010 | Academic Term |
+ ME Tarzan at metarzan@primates.edu or 555-555-5553 |
|
@@ -186,7 +226,37 @@
verifyTextPresent |
- ME Tarzan at metarzan@primates.edu or 555-555-5553 |
+ http://primatehealthintro.cornell.edu | Webpage |
+ |
+
+
+ verifyTextPresent |
+ Introduction to Primate Health | Course |
+ |
+
+
+ verifyTextPresent |
+ Primate Health Check | Event |
+ |
+
+
+ verifyTextPresent |
+ Animal Health | Subject Area |
+ |
+
+
+ verifyTextPresent |
+ Primate Health | Subject Area |
+ |
+
+
+ verifyTextPresent |
+ 9 |
+ |
+
+
+ verifyTextPresent |
+ Fall 2010 | Academic Term |
|
@@ -214,26 +284,6 @@
Fall 2010 | Academic Term |
|
-
- verifyTextPresent |
- Introduction to Primate Health | Course |
- |
-
-
- verifyTextPresent |
- Primate Health Check | Event |
- |
-
-
- verifyTextPresent |
- Animal Health | Subject Area |
- |
-
-
- verifyTextPresent |
- Primate Health | Subject Area |
- |
-
comment |
@@ -306,17 +356,7 @@
verifyTextPresent |
- 1234-5678 |
- |
-
-
- verifyTextPresent |
- 2010-09-01 |
- |
-
-
- verifyTextPresent |
- 2012-08-31 |
+ Africa | geographical_region |
|
@@ -324,6 +364,11 @@
P999-1234 |
|
+
+ verifyTextPresent |
+ 1234-5678 |
+ |
+
verifyTextPresent |
Primate Student of the Year | Award or Honor |
@@ -884,11 +929,6 @@
The Primate College of America is a privately-funded college for the study of primates. |
|
-
- verifyTextPresent |
- Privately Funded | Process |
- |
-
verifyTextPresent |
B.S. Bachelor of Science | Academic Degree |
@@ -921,7 +961,7 @@
verifyTextPresent |
- Primate Student of the Year | Award or Honor |
+ Best Primate College | Award or Honor Receipt |
|
@@ -956,12 +996,12 @@
verifyTextPresent |
- Primates-r-us Funding source 2010 - |
+ Primates-r-us | Founder |
|
verifyTextPresent |
- Primate Research Laboratory | Laboratory |
+ Primates-r-us | Organization |
|
@@ -991,7 +1031,7 @@
verifyTextPresent |
- northern Africa | geographical_region |
+ northern_Africa | geographical_region |
|
@@ -1014,6 +1054,11 @@
1234 Northern African Nation | Address |
|
+
+ verifyTextPresent |
+ Introduction to Primate Health | Course |
+ |
+
verifyTextPresent |
PCoA |
@@ -1191,7 +1236,12 @@
verifyTextPresent |
- Primate College of America Funding source 2010 - |
+ Leader Role |
+ |
+
+
+ verifyTextPresent |
+ Primate College of America | Founder |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
index 91bcca16..46b91d08 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
@@ -399,6 +399,36 @@
Primate Elderly Care |
|
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ //div[@id='geographicFocus']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ select |
+ objectVar |
+ label=Africa |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Primate Elderly Care |
+ |
+
comment |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index c55ac1ec..83a2d02a 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -269,6 +269,31 @@
Primate Health Conference |
|
+
+ clickAndWait |
+ //div[@id='organizer']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ select |
+ objectVar |
+ label=Librarian, Lily |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Primate Health Conference |
+ |
+
comment |
@@ -499,6 +524,31 @@
Primate Health Conference |
|
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ //div[@id='presents']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Primate Health Conference |
+ |
+
comment |
@@ -599,6 +649,11 @@
First annual conference for those interested in the general health of primates. |
|
+
+ verifyTextPresent |
+ Librarian, Lily | Assistant Librarian |
+ |
+
verifyTextPresent |
info@primateconf.org |
@@ -634,6 +689,11 @@
Winter 2011 | Academic Term |
|
+
+ verifyTextPresent |
+ http://primatehealthintro.cornell.edu | Webpage |
+ |
+
verifyTextPresent |
Primate Health Check | Event |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
index 00d8d0b8..41ec1236 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@@ -626,9 +626,14 @@
type |
- startYear |
+ startField.year |
1999 |
+
+ type |
+ endField.year |
+ |
+
clickAndWait |
submit |
@@ -666,9 +671,14 @@
type |
- startYear |
+ startField.year |
2010 |
+
+ type |
+ endField.year |
+ |
+
clickAndWait |
submit |
@@ -736,9 +746,14 @@
type |
- startYear |
+ startField.year |
2009 |
+
+ type |
+ endField.year |
+ |
+
clickAndWait |
submit |
@@ -811,9 +826,14 @@
type |
- startYear |
+ startField.year |
2010 |
+
+ type |
+ endField.year |
+ |
+
clickAndWait |
submit |
@@ -861,7 +881,7 @@
type |
- startYear |
+ startField.year |
2008 |
@@ -911,12 +931,12 @@
type |
- startYear |
+ startField.year |
2008 |
type |
- endYear |
+ endField.year |
2010 |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
index 64b53aa0..21371403 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
@@ -2064,6 +2064,11 @@
Building |
|
+
+ verifyTextNotPresent |
+ Room |
+ |
+
verifyTextPresent |
locations |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
index 82f1ff2e..c9bba6a6 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
@@ -109,6 +109,11 @@
link=equipment |
|
+
+ verifyElementPresent |
+ link=publications |
+ |
+
verifyElementPresent |
link=locations |
@@ -144,11 +149,6 @@
Primate Student of the Year | Award or Honor |
|
-
- verifyTextPresent |
- Primate Health and Fitness | Invited Talk |
- |
-
verifyTextPresent |
Primate Health Check | Event |
@@ -176,7 +176,22 @@
verifyTextPresent |
- Faculty, Jane | Assistant Professor |
+ Primate Health and Fitness | Invited Talk |
+ |
+
+
+ verifyTextPresent |
+ Introduction to Primate Health | Course |
+ |
+
+
+ verifyTextPresent |
+ Primate Research Lab Room 123 | Facility |
+ |
+
+
+ verifyTextPresent |
+ Primate College of America | College |
|
@@ -184,6 +199,11 @@
Primate Health | Subject Area |
|
+
+ verifyTextPresent |
+ Best Primate College | Award or Honor Receipt |
+ |
+
verifyTextPresent |
Animal Health | Subject Area |
@@ -196,7 +216,7 @@
verifyTextPresent |
- Primate Research Lab Room 123 | Facility |
+ Portable Primate Habitat | Equipment |
|
@@ -206,7 +226,7 @@
verifyTextPresent |
- Primate College of America | College |
+ Primate Health Conference | Conference |
|
@@ -216,32 +236,17 @@
verifyTextPresent |
- Fall 2010 | Academic Term |
+ http://primatehealthintro.cornell.edu | Webpage |
|
verifyTextPresent |
- Introduction to Primate Health | Semester Class |
- |
-
-
- verifyTextPresent |
- Elderly Care | Subject Area |
- |
-
-
- verifyTextPresent |
- Primate Health Conference | Conference |
- |
-
-
- verifyTextPresent |
- Privately Funded | Process |
+ Faculty, Jane | Assistant Professor |
|
clickAndWait |
- link=2 |
+ link=Next |
|
@@ -251,12 +256,12 @@
verifyTextPresent |
- Winter 2011 | Academic Term |
+ Elderly Care | Subject Area |
|
verifyTextPresent |
- Not sure | Vocabulary Source Reference |
+ Not sure | Vocabulary Source Reference |
|
@@ -269,6 +274,11 @@
1234 Northern African Nation | Address |
|
+
+ verifyTextPresent |
+ Librarian, Lily | Assistant Librarian |
+ |
+
verifyTextPresent |
northern_Africa | geographical_region |
@@ -299,6 +309,16 @@
Congo_the |
|
+
+ verifyTextPresent |
+ Fall 2010 | Academic Term |
+ |
+
+
+ verifyTextPresent |
+ Winter 2011 | Academic Term |
+ |
+
comment |
All done |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
index 392f4534..6bca1836 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
@@ -681,7 +681,7 @@
verifyTextPresent |
- Janette |
+ Jane |
|
@@ -691,7 +691,7 @@
verifyTextPresent |
- Facultee |
+ Faculty |
|
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyPosition.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyPosition.html
index 862ecf8c..64e150bc 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyPosition.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyPosition.html
@@ -144,24 +144,19 @@
|
-
- click |
- link=add a new organization |
- |
-
-
- type |
- newOrgName |
- Testing Department |
-
select |
- newOrgType |
+ typeSelector |
label=Academic Department |
type |
- title |
+ relatedIndLabel |
+ Testing Department |
+
+
+ type |
+ positionTitle |
Full Professor |
@@ -171,9 +166,14 @@
type |
- startYear |
+ startField.year |
1998 |
+
+ type |
+ endField.year |
+ |
+
clickAndWait |
submit |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
index 64e649d9..df1d3771 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
@@ -554,26 +554,6 @@
Faculty, Jane |
|
-
- clickAndWait |
- //div[@id='lastName']/div/div/span/span/a[2] |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- Faculty, Jane |
- |
-
clickAndWait |
//div[@id='prefixName']/div/div/span/span/a[2] |
@@ -934,6 +914,26 @@
Faculty, Jane |
|
+
+ clickAndWait |
+ link=delete |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
comment |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
index 079735f4..e367e2a4 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
@@ -479,31 +479,6 @@
Faculty, Jane |
|
-
- clickAndWait |
- //div[@id='firstName']/div/div/span/span/a[1] |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- type |
- tinymce |
- Janette |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- Faculty, Jane |
- |
-
clickAndWait |
//div[@id='middleName']/div/div/span/span/a[1] |
@@ -529,31 +504,6 @@
Faculty, Jane |
|
-
- clickAndWait |
- //div[@id='lastName']/div/div/span/span/a[1] |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- type |
- tinymce |
- Facultee |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- Faculty, Jane |
- |
-
clickAndWait |
//div[@id='phoneNumber']/div/div/span/span/a[1] |
@@ -911,7 +861,7 @@
verifyTextPresent |
- Janette |
+ Jane |
|
@@ -921,7 +871,7 @@
verifyTextPresent |
- Facultee |
+ Faculty |
|
diff --git a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html
index f634a17a..88db8db7 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html
@@ -249,21 +249,6 @@
Award or Honor |
|
-
- verifyTextNotPresent |
- Janette |
- |
-
-
- verifyTextNotPresent |
- E. |
- |
-
-
- verifyTextNotPresent |
- Facultee |
- |
-
verifyTextPresent |
607-288-8888 |