Holly changed test cases due to the modifications in the individual page and new dates.

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

@@ -131,7 +131,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='educationalTraining']/a</td>
+	<td>//div[@id='wrapper-content']/section[8]/article[1]/h3/a/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -156,7 +156,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='educationalTraining']/a</td>
+	<td>//div[@id='wrapper-content']/section[8]/article[1]/h3/a/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -256,19 +256,14 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>dateTime.year</td>
+	<td>startField.year</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>endField.year</td>
 	<td>1980</td>
 </tr>
-<tr>
-	<td>select</td>
-	<td>dateTime.month</td>
-	<td>label=month</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>dateTime.day</td>
-	<td>label=day</td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>submit</td>
@@ -289,6 +284,16 @@
 	<td class="comment">Enter in new organization name</td>
 	<td></td>
 </tr>
+<tr>
+	<td>type</td>
+	<td>startField.year</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>endField.year</td>
+	<td>1980</td>
+</tr>
 <tr>
 	<td>select</td>
 	<td>typeSelector</td>
@@ -341,12 +346,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, 1980</td>
+	<td>B.S.in Business Administration, Carroll College 1980 </td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Carroll College</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='educationalTraining']/a</td>
+	<td>//div[@id='wrapper-content']/section[8]/article[1]/h3/a/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -396,19 +406,14 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>dateTime.year</td>
+	<td>startField.year</td>
+	<td>1998</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>endField.year</td>
 	<td>2000</td>
 </tr>
-<tr>
-	<td>select</td>
-	<td>dateTime.month</td>
-	<td>label=month</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>dateTime.day</td>
-	<td>label=day</td>
-</tr>
 <tr>
 	<td>select</td>
 	<td>typeSelector</td>
@@ -441,12 +446,22 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, 1980</td>
+	<td>B.S.in Business Administration, Carroll College 1980 </td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Carroll College</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Department, 2000</td>
+	<td>M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Carroll University</td>
 	<td></td>
 </tr>
 <tr>
@@ -456,7 +471,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='educationalTraining']/a</td>
+	<td>//div[@id='wrapper-content']/section[8]/article[1]/h3/a/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -476,18 +491,13 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>dateTime.year</td>
+	<td>startField.year</td>
-	<td>2005</td>
+	<td>2002</td>
 </tr>
 <tr>
-	<td>select</td>
+	<td>type</td>
-	<td>dateTime.month</td>
+	<td>endField.year</td>
-	<td>label=month</td>
+	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>dateTime.day</td>
-	<td>label=day</td>
 </tr>
 <tr>
 	<td>select</td>
@@ -546,17 +556,32 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, 1980</td>
+	<td>B.S.in Business Administration, Carroll College 1980 </td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Carroll College</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Department, 2000</td>
+	<td>M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 </td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Carroll University</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
+	<td>M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 -</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=University of Wisconsin</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -136,17 +136,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, 1980</td>
+	<td>B.S.in Business Administration, Carroll College 1980</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Department, 2000</td>
+	<td>M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
+	<td>M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 -</td>
 	<td></td>
 </tr>
 <tr>
@@ -156,7 +156,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='educationalTraining']/ul/li[3]/span/span/a[1]</td>
+	<td>//div[@id='wrapper-content']/section[8]/article[1]/ul/li[3]/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,7 +171,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>dateTime.year</td>
+	<td>startField.year</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>endField.year</td>
 	<td>1981</td>
 </tr>
 <tr>
@@ -221,17 +226,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
+	<td>B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Department, 2000</td>
+	<td>M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
+	<td>M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 -</td>
 	<td></td>
 </tr>
 <tr>
@@ -241,7 +246,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='educationalTraining']/ul/li[2]/span/span/a[1]</td>
+	<td>//div[@id='wrapper-content']/section[8]/article[1]/ul/li[2]/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -296,17 +301,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
+	<td>B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Administration Department, 2000</td>
+	<td>M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
+	<td>M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 -</td>
 	<td></td>
 </tr>
 <tr>
@@ -316,7 +321,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='educationalTraining']/ul/li[1]/span/span/a[1]</td>
+	<td>//div[@id='wrapper-content']/section[8]/article[1]/ul/li[1]/a[2]/img</td>
 	<td></td>
 </tr>
 <tr>
@@ -376,17 +381,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
+	<td>B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Administration Department, 2000</td>
+	<td>M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, School of Business, 2005</td>
+	<td>M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 -</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -94,6 +94,11 @@
 	<td class="comment">Verify all 3 degrees appear properly</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Background</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>education and training</td>
@@ -101,17 +106,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, School of Business, 2005</td>
+	<td>M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 -</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll College, Business Department, 2000</td>
+	<td>M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
+	<td>B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -136,17 +136,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
+	<td>M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 -</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Department, 2000</td>
+	<td>M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, School of Business, 2005</td>
+	<td>B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
 	<td></td>
 </tr>
 <tr>
@@ -156,7 +156,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=delete</td>
+	<td>//img[@alt='delete']</td>
 	<td></td>
 </tr>
 <tr>
@@ -176,7 +176,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=delete</td>
+	<td>//img[@alt='delete']</td>
 	<td></td>
 </tr>
 <tr>
@@ -196,7 +196,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=delete</td>
+	<td>//img[@alt='delete']</td>
 	<td></td>
 </tr>
 <tr>
@@ -221,17 +221,17 @@
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
+	<td>M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 -</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Department, 2000</td>
+	<td>M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, School of Business, 2005</td>
+	<td>B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
 	<td></td>
 </tr>
 <tr>