From d62e3d41f7d55b5c46c4e4c3c649a3eb29567354 Mon Sep 17 00:00:00 2001
From: hlm7 <hlm7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 29 Nov 2010 14:50:54 +0000
Subject: [PATCH]

---
 .../CustomPositionsForm/AddPositions.html     | 116 +++++-------------
 .../CustomPositionsForm/ChangePositions.html  |  10 --
 2 files changed, 28 insertions(+), 98 deletions(-)

diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
index f1c2370e..87732345 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
@@ -141,7 +141,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>If your organization is not listed, please add a new organization.</td>
+	<td>Organization Type</td>
 	<td></td>
 </tr>
 <tr>
@@ -164,61 +164,21 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Elect to add a new organization</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>link=add a new organization</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Add only organization name, which results in error</td>
 	<td></td>
 </tr>
-<tr>
-	<td>type</td>
-	<td>newOrgName</td>
-	<td>Carroll College</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Must select a type for the new organization.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>This field must not be empty.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Add only organization name and type, which results in error</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>newOrgName</td>
-	<td>Carroll College</td>
-</tr>
 <tr>
 	<td>select</td>
-	<td>newOrgType</td>
+	<td>typeSelector</td>
 	<td>label=College</td>
 </tr>
+<tr>
+	<td>type</td>
+	<td>relatedIndLabel</td>
+	<td>Carroll College</td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>submit</td>
@@ -241,17 +201,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newOrgName</td>
-	<td>Carroll College</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>newOrgType</td>
-	<td>label=College</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>title</td>
+	<td>positionTitle</td>
 	<td>Lecturer</td>
 </tr>
 <tr>
@@ -274,26 +224,11 @@
 	<td class="comment">Enter in all fields except for end year</td>
 	<td></td>
 </tr>
-<tr>
-	<td>type</td>
-	<td>newOrgName</td>
-	<td>Carroll College</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>newOrgType</td>
-	<td>label=College</td>
-</tr>
 <tr>
 	<td>select</td>
 	<td>positionType</td>
 	<td>label=Faculty Administrative Position</td>
 </tr>
-<tr>
-	<td>type</td>
-	<td>title</td>
-	<td>Lecturer</td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>startYear</td>
@@ -336,12 +271,22 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>organizationUri</td>
-	<td>label=Carroll College</td>
+	<td>typeSelector</td>
+	<td>label=College</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>title</td>
+	<td>relatedIndLabel</td>
+	<td>Carro</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>ui-active-menuitem</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>positionTitle</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
@@ -399,24 +344,19 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>link=add a new organization</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>newOrgName</td>
-	<td>Cornell University</td>
-</tr>
 <tr>
 	<td>select</td>
-	<td>newOrgType</td>
+	<td>typeSelector</td>
 	<td>label=University</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>title</td>
+	<td>relatedIndLabel</td>
+	<td>Cornell University</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>positionTitle</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html
index 858b80fd..a9480b25 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html
@@ -239,16 +239,6 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>link=add a new organization</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>newOrgName</td>