diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
index 97734033..242bb585 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
@@ -64,6 +64,11 @@
5000 |
|
+
+ verifyTextPresent |
+ Visual Graph |
+ |
+
assertTitle |
People |
@@ -106,257 +111,497 @@
comment |
-
+
|
- click |
- link=Faculty Member (1) |
+ clickAndWait |
+ link=Subject Area |
|
- pause |
- 5000 |
+ assertTitle |
+ Subject Area |
|
verifyElementPresent |
- link=Jane Faculty |
+ link=Animal Health |
|
verifyTextPresent |
- Assistant Professor |
- |
-
-
- click |
- link=F |
- |
-
-
- pause |
- 5000 |
+ Animal Health Subject Area |
|
verifyElementPresent |
- link=Jane Faculty |
+ link=Elderly Care |
|
verifyTextPresent |
- Assistant Professor |
- |
-
-
- click |
- link=All |
- |
-
-
- pause |
- 5000 |
+ Elderly Care Subject Area |
|
verifyElementPresent |
- link=Jane Faculty |
+ link=Primate Diet |
|
verifyTextPresent |
- Assistant Professor |
+ Primate Diet Subject Area |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
+
+ verifyTextPresent |
+ Primate Health Subject Area |
+ |
+
+
+ clickAndWait |
+ link=People |
+ |
+
+
+ assertTitle |
+ People |
|
comment |
-
+
|
- click |
- link=Librarian (1) |
+ clickAndWait |
+ link=Department |
|
- pause |
- 5000 |
+ assertTitle |
+ Department |
|
- verifyElementPresent |
- link=Lily Librarian |
+ clickAndWait |
+ link=People |
|
- verifyTextPresent |
- Assistant Librarian |
- |
-
-
- click |
- link=L |
- |
-
-
- pause |
- 5000 |
- |
-
-
- verifyElementPresent |
- link=Lily Librarian |
- |
-
-
- verifyTextPresent |
- Assistant Librarian |
- |
-
-
- click |
- link=All |
- |
-
-
- pause |
- 5000 |
- |
-
-
- verifyElementPresent |
- link=Lily Librarian |
- |
-
-
- verifyTextPresent |
- Assistant Librarian |
+ assertTitle |
+ People |
|
comment |
-
+
+ |
+
+
+ clickAndWait |
+ link=Courses |
+ |
+
+
+ assertTitle |
+ Course |
+ |
+
+
+ verifyElementPresent |
+ link=Introduction to Primate Health |
+ |
+
+
+ verifyTextPresent |
+ Introduction to Primate Health Course |
+ |
+
+
+ clickAndWait |
+ link=People |
+ |
+
+
+ assertTitle |
+ People |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Organizations |
+ |
+
+
+ assertTitle |
+ Organizations |
+ |
+
+
+ verifyElementPresent |
+ link=College (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Consortium (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Laboratory (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Library (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Organization (5) |
|
click |
- link=Person (2) |
- |
-
-
- pause |
- 5000 |
+ //li[@id='college']/a |
|
verifyElementPresent |
- link=Jane Faculty |
- |
-
-
- verifyTextPresent |
- Assistant Professor |
- |
-
-
- verifyElementPresent |
- link=Lily Librarian |
- |
-
-
- verifyTextPresent |
- Assistant Librarian |
+ link=Primate College of America |
|
click |
- link=F |
- |
-
-
- pause |
- 5000 |
+ //li[@id='consortium']/a |
|
verifyElementPresent |
- link=Jane Faculty |
- |
-
-
- verifyTextPresent |
- Assistant Professor |
- |
-
-
- verifyElementNotPresent |
- link=Lily Librarian |
- |
-
-
- verifyTextNotPresent |
- Assistant Librarian |
+ link=Primate Colleges of the World |
|
click |
- link=L |
- |
-
-
- pause |
- 5000 |
+ //li[@id='laboratory']/a |
|
verifyElementPresent |
- link=Lily Librarian |
- |
-
-
- verifyTextPresent |
- Assistant Librarian |
- |
-
-
- verifyElementNotPresent |
- link=Jane Faculty |
- |
-
-
- verifyTextNotPresent |
- Assistant Professor |
+ link=Primate Research Laboratory |
|
click |
- link=All |
- |
-
-
- pause |
- 5000 |
+ //li[@id='library']/a |
|
verifyElementPresent |
- link=Jane Faculty |
+ link=Primate History Library |
|
- verifyTextPresent |
- Assistant Professor |
+ click |
+ //li[@id='organization']/a |
|
verifyElementPresent |
- link=Lily Librarian |
+ link=Primate College of America |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Colleges of the World |
+ |
+
+
+ verifyElementPresent |
+ link=Primate History Library |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Research Laboratory |
+ |
+
+
+ verifyElementPresent |
+ link=Primates-r-us |
+ |
+
+
+ click |
+ //li[@id='organization']/a |
+ |
+
+
+ click |
+ link=P |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Colleges of the World |
+ |
+
+
+ verifyElementPresent |
+ link=Primate History Library |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Research Laboratory |
+ |
+
+
+ verifyElementPresent |
+ link=Primates-r-us |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Research |
+ |
+
+
+ assertTitle |
+ Research |
+ |
+
+
+ verifyElementPresent |
+ link=Book (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Database (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Grant (3) |
+ |
+
+
+ verifyElementPresent |
+ link=Proceedings (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Subject Area (4) |
|
verifyTextPresent |
- Assistant Librarian |
+ Webpage (1) |
+ |
+
+
+ click |
+ //li[@id='book']/a |
+ |
+
+
+ verifyElementPresent |
+ link=PHC Proceedings |
+ |
+
+
+ click |
+ //li[@id='database']/a |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Info |
+ |
+
+
+ click |
+ //li[@id='grant']/a |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Elderly Care |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Habitat Research Grant |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Survival Planning Grant |
+ |
+
+
+ click |
+ //li[@id='proceedings']/a |
+ |
+
+
+ verifyElementPresent |
+ link=PHC Proceedings |
+ |
+
+
+ click |
+ //li[@id='subjectArea']/a |
+ |
+
+
+ verifyElementPresent |
+ link=Animal Health |
+ |
+
+
+ verifyElementPresent |
+ link=Elderly Care |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Diet |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
+
+ click |
+ //li[@id='webpage']/a |
+ |
+
+
+ verifyElementPresent |
+ link=exact:http://primatehealthintro.cornell.edu |
+ |
+
+
+ click |
+ //li[@id='subjectArea']/a |
+ |
+
+
+ click |
+ link=P |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Diet |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Events |
+ |
+
+
+ assertTitle |
+ Events |
+ |
+
+
+ verifyElementPresent |
+ link=Conference (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Invited Talk (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Presentation (1) |
+ |
+
+
+ click |
+ //li[@id='conference']/a |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Conference |
+ |
+
+
+ click |
+ //li[@id='invitedTalk']/a |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health and Fitness |
+ |
+
+
+ click |
+ //li[@id='presentation']/a |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health and Fitness |
+ |
+
+
+ click |
+ //li[@id='conference']/a |
+ |
+
+
+ click |
+ link=P |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Conference |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
index bcf8d576..35a15861 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@@ -216,7 +216,7 @@
clickAndWait |
- //section[@id='individual-info']/h3/a/img |
+ //h2[@id='overview']/a/img |
|