diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
index b1a751cd..15c586fc 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
@@ -81,12 +81,12 @@
| clickAndWait |
- link=Primate Heart Health Clinic |
+ link=Primate Heart Health |
|
| assertTitle |
- Primate Heart Health Clinic |
+ Primate Heart Health |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
index 75d34e50..fd3065b8 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
@@ -435,9 +435,14 @@
|
- | select |
- objectVar |
- label=Africa |
+ type |
+ id=object |
+ Afri |
+
+
+ | click |
+ id=ui-active-menuitem |
+ |
| clickAndWait |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
index 57623885..18e48a94 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@@ -340,9 +340,14 @@
|
- | select |
- objectVar |
- label=Africa |
+ type |
+ id=object |
+ Afri |
+
+
+ | click |
+ id=ui-active-menuitem |
+ |
| clickAndWait |
@@ -375,9 +380,14 @@
|
- | select |
- objectVar |
- label=Liberia |
+ type |
+ id=object |
+ Libe |
+
+
+ | click |
+ id=ui-active-menuitem |
+ |
| clickAndWait |
@@ -476,7 +486,7 @@
| clickAndWait |
- //input[@id='submit' and @value='Add a new item of this type'] |
+ id=offerCreate |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
index cb76c66b..3db0cb8d 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
@@ -261,7 +261,7 @@
| clickAndWait |
- submit |
+ id=offerCreate |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index f63ff82f..0531b898 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -246,7 +246,7 @@
| clickAndWait |
- submit |
+ id=offerCreate |
|
@@ -350,9 +350,14 @@
|
- | select |
- objectVar |
- label=Kenya |
+ type |
+ id=object |
+ Ken |
+
+
+ | click |
+ id=ui-active-menuitem |
+ |
| clickAndWait |
@@ -385,9 +390,14 @@
|
- | select |
- id=objectVar |
- label=Congo |
+ type |
+ id=object |
+ Con |
+
+
+ | click |
+ id=ui-active-menuitem |
+ |
| clickAndWait |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
index 6ca65a98..9aaca2a2 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
@@ -220,13 +220,23 @@
|
- | select |
- objectVar |
- label=Primate Research Laboratory |
+ clickAndWait |
+ id=offerCreate |
+ |
+
+
+ | assertTitle |
+ Edit |
+ |
+
+
+ | type |
+ id=name |
+ Primate Research Laboratory |
| clickAndWait |
- submit |
+ id=submit |
|
@@ -256,7 +266,7 @@
| clickAndWait |
- submit |
+ id=offerCreate |
|
@@ -306,7 +316,7 @@
| clickAndWait |
- //input[@id='submit' and @value='Add a new item of this type'] |
+ id=offerCreate |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
index a0461a16..f50c8a8d 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@@ -486,7 +486,7 @@
| clickAndWait |
- //input[@id='submit' and @value='Add a new item of this type'] |
+ id=offerCreate |
|
@@ -526,7 +526,7 @@
| clickAndWait |
- //input[@id='submit' and @value='Add a new item of this type'] |
+ id=offerCreate |
|
@@ -576,8 +576,13 @@
| type |
- id=relatedIndLabel |
- Polly Person |
+ id=person |
+ Person |
+
+
+ | type |
+ id=firstName |
+ Polly |
| clickAndWait |
@@ -606,7 +611,7 @@
| type |
- relatedIndLabel |
+ id=activity |
Primates-r-us |
@@ -671,7 +676,7 @@
| type |
- relatedIndLabel |
+ id=activity |
Primate Colleges of the World |
@@ -705,9 +710,14 @@
|
- | select |
- objectVar |
- label=Primate History Library |
+ type |
+ id=object |
+ Primate His |
+
+
+ | click |
+ id=ui-active-menuitem |
+ |
| clickAndWait |
@@ -736,8 +746,8 @@
| type |
- relatedIndLabel |
- Primate Heart Health Clinic |
+ id=activity |
+ Primate Heart Health |
| type |
@@ -781,7 +791,7 @@
| type |
- relatedIndLabel |
+ id=title |
Primate Info |
@@ -811,7 +821,7 @@
| type |
- relatedIndLabel |
+ id=presentation |
Primate Health and Fitness |
@@ -826,7 +836,7 @@
| clickAndWait |
- submit |
+ css=input.submit |
|
@@ -856,7 +866,7 @@
| type |
- relatedIndLabel |
+ id=activity |
Primate Health Check |
@@ -900,9 +910,14 @@
|
- | select |
- objectVar |
- label=northern Africa |
+ type |
+ id=object |
+ northern Afr |
+
+
+ | click |
+ id=ui-active-menuitem |
+ |
| clickAndWait |
@@ -1019,6 +1034,16 @@
Edit |
|
+
+ | select |
+ id=country |
+ label=Morocco |
+
+
+ |
+ |
+ |
+
| clickAndWait |
//input[@id='submit' and @value='Add a new item of this type'] |
@@ -1031,12 +1056,22 @@
| type |
- name |
+ id=addrLineOne |
1234 Northern African Nation |
+
+ | type |
+ id=city |
+ Morocco City |
+
+
+ | type |
+ id=postalCode |
+ 1234567890 |
+
| clickAndWait |
- submit |
+ id=submit |
|
@@ -1201,7 +1236,7 @@
| verifyTextPresent |
- Polly Person, Dr. 1999 - |
+ Person, Polly, Dr. 1999 - |
|
@@ -1226,7 +1261,7 @@
| verifyTextPresent |
- Primate Heart Health Clinic Founder 2010 - |
+ Primate Heart Health Founder 2010 - |
|
@@ -1269,9 +1304,24 @@
| 555-555-5554 |
|
+
+ | verifyElementPresent |
+ link=1234 Northern African Nation |
+ |
+
| verifyTextPresent |
- 1234 Northern African Nation |
+ Morocco City |
+ |
+
+
+ | verifyTextPresent |
+ 1234567890 |
+ |
+
+
+ | verifyTextPresent |
+ Morocco |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
index 99b7855e..16bcf7ec 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
@@ -256,7 +256,7 @@
| clickAndWait |
- //input[@id='submit' and @value='Add a new item of this type'] |
+ id=offerCreate |
|
@@ -301,7 +301,7 @@
| clickAndWait |
- //input[@id='submit' and @value='Add a new item of this type'] |
+ id=offerCreate |
|