More test changes from Holly.

utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html

@@ -246,12 +246,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>1980</td>
 </tr>
 <tr>
@@ -276,12 +276,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>1980</td>
 </tr>
 <tr>
@@ -396,12 +396,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>1998</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2000</td>
 </tr>
 <tr>
@@ -481,12 +481,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2002</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html

@@ -146,7 +146,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/section[7]/article[1]/ul/li[3]/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/section[7]/article[3]/ul/li[3]/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -161,12 +161,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>1981</td>
 </tr>
 <tr>
@@ -234,9 +234,14 @@
 	<td class="comment">Change department for M.B.A. degree</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty, Jane</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/section[7]/article[1]/ul/li[2]/a[2]/img</td>
+	<td>//div[@id='wrapper-content']/section[7]/article[3]/ul/li[2]/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -311,7 +316,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/section[7]/article[1]/ul/li[1]/a[2]/img</td>
+	<td>css=a.edit-educationalTraining &gt; img.edit-individual</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html

@@ -39,6 +39,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
@@ -145,57 +150,42 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
-	<td>link=Edit this individual</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
+	<td>assertTextPresent</td>
+	<td>Faculty Member</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value='Edit This Individual']</td>
+	<td>css=a.add-preferredTitle &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Editing Form</td>
+	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
-	<td>select</td>
-	<td>Moniker</td>
-	<td>label=[new moniker]</td>
+	<td>verifyTextPresent</td>
+	<td>Add new entry for: preferred title</td>
+	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>MonikerSelectAlt</td>
+	<td>tinymce</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>primaryAction</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Verify that account was created</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>assertTextPresent</td>
 	<td>Assistant Professor</td>
 	<td></td>
 </tr>

utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html

@@ -79,6 +79,11 @@
 	<td>link=Carroll University</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Faculty, Jane</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>querytext</td>
@@ -99,6 +104,16 @@
 	<td>link=University of Wisconsin</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Wisconsin</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Faculty, Jane</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Home</td>