diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html index a51090b8..f14cdba7 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html @@ -144,36 +144,46 @@ Site Configuration - - verifyElementPresent - link=Site information - - - - verifyElementPresent - link=Menu management - - verifyElementPresent link=Institutional internal class - - verifyElementPresent - link=User accounts - - verifyElementPresent link=Manage profile editing + + verifyElementPresent + link=Page management + + + + verifyElementPresent + link=Menu ordering + + + + verifyElementPresent + link=Restrict Logins + + + + verifyElementPresent + link=Site information + + verifyElementPresent link=Startup status + + verifyElementPresent + link=User accounts + + verifyTextPresent Ontology Editor @@ -226,12 +236,12 @@ verifyElementPresent - link=Ingest tools + link=Add/Remove RDF data verifyElementPresent - link=Add/Remove RDF data + link=Ingest tools @@ -259,11 +269,6 @@ link=Rebuild search index - - verifyElementPresent - link=Rebuild class group cache - - verifyElementPresent link=Rebuild visualization cache diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html index 3c61772a..2753a282 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html @@ -166,7 +166,7 @@ click - //input[@name='role' and @value='http://permissionSet-50'] + xpath=(//input[@name='role'])[1] diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html index 5bb2911a..08adef01 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html @@ -156,7 +156,17 @@ verifyElementPresent - link=Menu management + link=Page management + + + + verifyElementPresent + link=Menu ordering + + + + verifyElementPresent + link=Restrict Logins @@ -179,6 +189,11 @@ Ontology Editor + + verifyElementPresent + link=Ontology list + + verifyTextPresent Class Management @@ -214,11 +229,6 @@ link=Property groups - - verifyElementPresent - link=Ontology list - - verifyTextPresent Advanced Data Tools @@ -254,11 +264,6 @@ Refresh Content - - verifyElementPresent - link=Rebuild class group cache - - verifyElementPresent link=Rebuild search index @@ -356,7 +361,42 @@ clickAndWait - link=Menu management + link=Page management + + + + assertTitle + Pages + + + + verifyTextPresent + Page Management + + + + verifyTextPresent + Home + + + + verifyTextNotPresent + We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help. + + + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Menu ordering @@ -366,7 +406,42 @@ verifyTextPresent - Menu management + Menu Ordering + + + + verifyTextPresent + Home + + + + verifyTextNotPresent + We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help. + + + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Restrict Logins + + + + assertTitle + Restrict Logins + + + + verifyTextPresent + Restrict Logins @@ -506,7 +581,7 @@ assertTitle - Class Groups + VIVO @@ -541,7 +616,7 @@ assertTitle - Class Hierarchy + VIVO @@ -576,7 +651,7 @@ assertTitle - Data Property Hierarchy + VIVO @@ -611,7 +686,7 @@ assertTitle - Object Property Hierarchy + VIVO @@ -899,36 +974,6 @@ Make sure available Refresh Content options actually open up - - clickAndWait - link=Rebuild class group cache - - - - assertTitle - Index of Contents - - - - verifyElementPresent - link=Continent - - - - verifyTextNotPresent - We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help. - - - - clickAndWait - link=Site Admin - - - - assertTitle - VIVO Site Administration - - clickAndWait link=Rebuild search index diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html index 5bd5a6d4..2b93a7b4 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html @@ -90,8 +90,8 @@ - clickAndWait - loginForm + click + name=loginForm @@ -121,7 +121,7 @@ clickAndWait - loginForm + name=loginForm @@ -156,7 +156,7 @@ clickAndWait - loginForm + name=loginForm @@ -250,13 +250,13 @@ - clickAndWait - passwordChangeForm + click + name=passwordChangeForm verifyTextPresent - Please enter your new password. + Change Password to Log in diff --git a/utilities/acceptance-tests/suites/AdminSecurity/RebuildSearchIndex.html b/utilities/acceptance-tests/suites/AdminSecurity/RebuildSearchIndex.html index 19bccbaa..da323202 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/RebuildSearchIndex.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/RebuildSearchIndex.html @@ -39,6 +39,11 @@ + + setTimeout + 100000000000 + + open /vivo/