More fine tuning of the proxy editing test suite by Holly.

utilities/acceptance-tests/suites/ProxyEditing/CreateNewFacultyMember.html

@@ -154,6 +154,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>

utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html

@@ -151,12 +151,12 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u5108']</td>
+	<td>//input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u4845']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u7926']</td>
+	<td>//input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u4682']</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,7 +171,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Deleted 3 accounts. </td>
+	<td>Deleted 3 accounts.</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html

@@ -484,6 +484,11 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>You have logged in, but the system contains no profile for you.</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Faculty Member</td>
@@ -514,10 +519,15 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
-	<td>I am able to edit.</td>
+	<td>Eddie is able to edit.</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -531,7 +541,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>I am able to edit.</td>
+	<td>Eddie is able to edit.</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html

@@ -264,6 +264,16 @@
 	<td>link=Log out</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Log in</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Log in to VIVO</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>id=loginName</td>
@@ -284,9 +294,34 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>You have logged in, but the system contains no profile for you.</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=My profile</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index of Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Librarian</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Librarian</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Librarian, Lily</td>
 	<td></td>
 </tr>
 <tr>
@@ -294,26 +329,6 @@
 	<td>Librarian, Lily</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>css=img.delete-individual</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Faculty, Jane</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>css=a.add-overview &gt; img.add-individual</td>
@@ -324,10 +339,15 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
-	<td>Eddie is able to edit Lily.</td>
+	<td>Eddie is able to edit Lily's profile.</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -341,7 +361,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Eddie is able to edit Lily.</td>
+	<td>Eddie is able to edit Lily's profile.</td>
 	<td></td>
 </tr>
 <tr>
@@ -374,6 +394,26 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>css=img.delete-individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>id=submit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty, Jane</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>css=a.add-overview &gt; img.add-individual</td>
@@ -384,10 +424,15 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
-	<td>Eddie is able to edit Jane.</td>
+	<td>Eddie is able to edit Jane's profile.</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -401,7 +446,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Eddie is able to edit Jane.</td>
+	<td>Eddie is able to edit Jane's profile.</td>
 	<td></td>
 </tr>
 <tr>
@@ -454,9 +499,39 @@
 	<td>name=passwordChangeForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>You have logged in, but the system contains no profile for you.</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=My profile</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index of Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Faculty</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -474,10 +549,15 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
-	<td>Polly is able to edit Jane.</td>
+	<td>Polly is able to edit Jane's profile too.</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -491,7 +571,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Polly is able to edit Jane. </td>
+	<td>Polly is able to edit Jane's profile too.</td>
 	<td></td>
 </tr>
 <tr>
@@ -519,11 +599,6 @@
 	<td>Librarian, Lily</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Index of Contents</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>Overview</td>

utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html

@@ -299,11 +299,6 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Site Admin</td>
@@ -326,7 +321,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Editor, Eddie | </td>
+	<td>Editor, Eddie |</td>
 	<td></td>
 </tr>
 <tr>
@@ -336,7 +331,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Proxy, Polly | </td>
+	<td>Proxy, Polly |</td>
 	<td></td>
 </tr>
 <tr>
@@ -346,7 +341,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Faculty, Jane | Faculty Member </td>
+	<td>Faculty, Jane | Faculty Member</td>
 	<td></td>
 </tr>
 <tr>