Holly made minor test case changes while testing 1.6.1

utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html

@@ -103,14 +103,24 @@
 	<td>Hours</td>
 </tr>
 <tr>
-	<td>select</td>
+	<td>selectWindow</td>
-	<td>HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
+	<td>null</td>
-	<td>label=site administrator</td>
+	<td></td>
 </tr>
 <tr>
 	<td>select</td>
-	<td>ProhibitedFromUpdateBelowRoleLevelUsingRoleUri</td>
+	<td>name=HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
-	<td>label=site administrator</td>
+	<td>label=site admin and root user</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri</td>
+	<td>label=site admin and root user</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=HiddenFromPublishBelowRoleLevelUsingRoleUri</td>
+	<td>label=all users, including public</td>
 </tr>
 <tr>
 	<td>select</td>
@@ -155,7 +165,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>site administrator</td>
+	<td>site admin and root user</td>
 	<td></td>
 </tr>
 <tr>
@@ -173,6 +183,11 @@
 	<td>http://vivo.mydomain.edu/individual/hours</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>all users, including public</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//input[@value='Show All Classes']</td>

utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html

@@ -104,13 +104,18 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
+	<td>name=HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
-	<td>label=editor, curator, site administrator</td>
+	<td>label=editor and above</td>
 </tr>
 <tr>
 	<td>select</td>
-	<td>ProhibitedFromUpdateBelowRoleLevelUsingRoleUri</td>
+	<td>name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri</td>
-	<td>label=editor, curator, site administrator</td>
+	<td>label=editor and above</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=HiddenFromPublishBelowRoleLevelUsingRoleUri</td>
+	<td>label=all users, including public</td>
 </tr>
 <tr>
 	<td>select</td>
@@ -155,7 +160,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>editor, curator, site administrator</td>
+	<td>editor and above</td>
 	<td></td>
 </tr>
 <tr>
@@ -173,6 +178,11 @@
 	<td>http://vivo.mydomain.edu/individual/minutes</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>all users, including public</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//input[@value='Show All Classes']</td>

utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html

@@ -107,21 +107,26 @@
 	<td>GroupURI</td>
 	<td>label=Place</td>
 </tr>
-<tr>
-	<td>select</td>
-	<td>HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
-	<td>label=editor, curator, site administrator</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>ProhibitedFromUpdateBelowRoleLevelUsingRoleUri</td>
-	<td>label=public</td>
-</tr>
 <tr>
 	<td>select</td>
 	<td>name=Namespace</td>
 	<td>label=VIVO Core</td>
 </tr>
+<tr>
+	<td>select</td>
+	<td>name=HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
+	<td>label=self-editor and above</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri</td>
+	<td>label=editor and above</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=HiddenFromPublishBelowRoleLevelUsingRoleUri</td>
+	<td>label=curator and above</td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>LocalName</td>
@@ -173,6 +178,11 @@
 	<td>architecturalDetails</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Agent (foaf)</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>http://www.w3.org/2001/XMLSchema#string</td>
@@ -185,12 +195,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>editor, curator, site administrator</td>
+	<td>self-editor and above</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>public</td>
+	<td>editor and above</td>
 	<td></td>
 </tr>
 <tr>
@@ -208,6 +218,11 @@
 	<td>http://vivoweb.org/ontology/core#architecturalDetails </td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>curator and above</td>
+	<td></td>
+</tr>
 <!--Check data properties hierarchy-->
 <tr>
 	<td>clickAndWait</td>
@@ -306,12 +321,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>editor, curator, site administrator</td>
+	<td>self-editor and above</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>public</td>
+	<td>editor and above</td>
 	<td></td>
 </tr>
 <tr>
@@ -329,6 +344,11 @@
 	<td>http://vivoweb.org/ontology/core#architecturalDetails</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>curator and above</td>
+	<td></td>
+</tr>
 <!--Log out-->
 <tr>
 	<td>clickAndWait</td>

utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html

@@ -150,12 +150,17 @@
 <tr>
 	<td>select</td>
 	<td>name=HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
-	<td>label=editor, curator, site administrator</td>
+	<td>label=editor and above</td>
 </tr>
 <tr>
 	<td>select</td>
 	<td>name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri</td>
-	<td>label=site administrator</td>
+	<td>label=self-editor and above</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=HiddenFromPublishBelowRoleLevelUsingRoleUri</td>
+	<td>label=all users, including public</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -230,12 +235,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>editor, curator, site administrator</td>
+	<td>editor and above</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>site administrator</td>
+	<td>self-editor and above</td>
 	<td></td>
 </tr>
 <tr>
@@ -263,6 +268,11 @@
 	<td>http://purl.org/ontology/bibo/yearFounded</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>all users, including public</td>
+	<td></td>
+</tr>
 <!--Log out-->
 <tr>
 	<td>clickAndWait</td>

utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html

@@ -105,7 +105,7 @@
 <tr>
 	<td>select</td>
 	<td>name=HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
-	<td>label=public</td>
+	<td>label=curator and above</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -120,7 +120,7 @@
 <!--Verify that changes took place-->
 <tr>
 	<td>verifyTextPresent</td>
-	<td>public</td>
+	<td>curator and above</td>
 	<td></td>
 </tr>
 <!--Log out-->

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

@@ -116,41 +116,6 @@
 	<td>Faculty Member</td>
 	<td></td>
 </tr>
-<tr>
-	<td>selectWindow</td>
-	<td>null</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>css=header &gt; #ARG_2000028 &gt; a.add-ARG_2000028 &gt; img.add-individual</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=preferredTitle</td>
-	<td>Assistant Professor</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>assertTextPresent</td>
-	<td>Assistant Professor</td>
-	<td></td>
-</tr>
 <!--Logout-->
 <tr>
 	<td>clickAndWait</td>

utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html

@@ -303,12 +303,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Version rel-1.6-rc5</td>
+	<td>Version rel-1.6.1-rc1</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=rel-1.6-rc5</td>
+	<td>link=rel-1.6.1-rc1</td>
 	<td></td>
 </tr>
 <tr>
@@ -639,12 +639,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Version rel-1.6-rc</td>
+	<td>Version rel-1.6.1-rc1</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=rel-1.6-rc5</td>
+	<td>link=rel-1.6.1-rc1</td>
 	<td></td>
 </tr>
 <!--Logout-->