diff --git a/.gitignore b/.gitignore
index d5374069..309fa722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/runtime.properties
/ontology/public/catalog-v0001.xml
+rdf/auth/firsttime/test-user-model.owl
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html
index 53411a92..b578d782 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html
@@ -199,7 +199,7 @@
verifyTextPresent |
- Password must be between 6 and 12 characters. |
+ Please enter a password between 6 and 12 characters in length. |
|
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
index 355c44ad..678a560a 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
@@ -96,11 +96,21 @@
VIVO Site Administration |
|
+
+ verifyTextPresent |
+ Site Administration |
+ |
+
verifyTextPresent |
Data Input |
|
+
+ verifyValue |
+ id=submit |
+ Add individual of this class |
+
verifyTextPresent |
Site Configuration |
@@ -163,12 +173,12 @@
verifyElementPresent |
- link=Class groups |
+ link=Class hierarchy |
|
verifyElementPresent |
- link=Class hierarchy |
+ link=Class groups |
|
@@ -178,12 +188,12 @@
verifyElementPresent |
- link=Data property hierarchy |
+ link=Object property hierarchy |
|
verifyElementPresent |
- link=Object property hierarchy |
+ link=Data property hierarchy |
|
@@ -292,6 +302,11 @@
Manage profile editing |
|
+
+ verifyTextPresent |
+ Relate profile editors and profiles |
+ |
+
verifyTextPresent |
Select editors |
@@ -302,6 +317,11 @@
Select profiles |
|
+
+ verifyTextPresent |
+ Profile editors |
+ |
+
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. |
@@ -332,11 +352,46 @@
Page management |
|
+
+ verifyTextPresent |
+ Title |
+ |
+
+
+ verifyTextPresent |
+ URL |
+ |
+
+
+ verifyTextPresent |
+ Custom Template |
+ |
+
+
+ verifyTextPresent |
+ Menu Page |
+ |
+
+
+ verifyTextPresent |
+ Controls |
+ |
+
verifyTextPresent |
Home |
|
+
+ verifyTextPresent |
+ Use Menu Ordering to set the order of menu items. |
+ |
+
+
+ verifyElementPresent |
+ id=menuMgmtLink |
+ |
+
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. |
@@ -372,6 +427,31 @@
Home |
|
+
+ verifyTextPresent |
+ People |
+ |
+
+
+ verifyTextPresent |
+ Organizations |
+ |
+
+
+ verifyTextPresent |
+ Research |
+ |
+
+
+ verifyTextPresent |
+ Events |
+ |
+
+
+ verifyTextPresent |
+ Refresh page after reordering menu items |
+ |
+
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. |
@@ -389,7 +469,7 @@
clickAndWait |
- link=Restrict Logins |
+ link=Restrict logins |
|
@@ -402,6 +482,16 @@
Restrict Logins |
|
+
+ verifyTextPresent |
+ Logins are open to all. |
+ |
+
+
+ verifyElementPresent |
+ link=Restrict Logins |
+ |
+
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. |
@@ -437,6 +527,31 @@
Editing Existing Record |
|
+
+ verifyTextPresent |
+ Site name (max 50 characters) |
+ |
+
+
+ verifyTextPresent |
+ Contact email address contact form submissions will be sent to this address |
+ |
+
+
+ verifyTextPresent |
+ Theme |
+ |
+
+
+ verifyTextPresent |
+ Copyright text used in footer (e.g., name of your institution) |
+ |
+
+
+ verifyTextPresent |
+ Copyright URL copyright text links to this URL |
+ |
+
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. |
@@ -504,7 +619,37 @@
verifyTextPresent |
- Email address |
+ Email Address |
+ |
+
+
+ verifyTextPresent |
+ First name |
+ |
+
+
+ verifyTextPresent |
+ Last name |
+ |
+
+
+ verifyTextPresent |
+ Status |
+ |
+
+
+ verifyTextPresent |
+ Roles |
+ |
+
+
+ verifyTextPresent |
+ Login count |
+ |
+
+
+ verifyTextPresent |
+ Last Login |
|
@@ -530,22 +675,42 @@
clickAndWait |
- link=Class groups |
+ link=Ontology list |
|
assertTitle |
- VIVO |
+ Ontologies |
|
verifyTextPresent |
- Class Groups |
+ Ontologies |
+ |
+
+
+ verifyValue |
+ css=input.form-button |
+ Add new ontology |
+
+
+ verifyTextPresent |
+ Ontology |
+ |
+
+
+ verifyTextPresent |
+ Namespace |
+ |
+
+
+ verifyTextPresent |
+ Prefix |
|
verifyElementPresent |
- link=people |
+ link=VIVO Core |
|
@@ -575,12 +740,32 @@
verifyTextPresent |
- Class Hierarchy |
+ Asserted Class Hierarchy |
|
+
+ verifyTextPresent |
+ Display Options |
+ |
+
+
+ verifyValue |
+ id=addClass |
+ Add New Class |
+
verifyElementPresent |
- link=exact:vivo:Address |
+ link=expand all |
+ |
+
+
+ verifyTextPresent |
+ Ontology |
+ |
+
+
+ verifyTextPresent |
+ Subclasses |
|
@@ -600,7 +785,7 @@
clickAndWait |
- link=Data property hierarchy |
+ link=Class groups |
|
@@ -610,12 +795,42 @@
verifyTextPresent |
- Data Property Hierarchy |
+ Class Groups |
+ |
+
+
+ verifyTextPresent |
+ Display Options |
|
verifyElementPresent |
- link=abbreviation |
+ id=addClass |
+ |
+
+
+ verifyElementPresent |
+ id=addGroup |
+ |
+
+
+ verifyElementPresent |
+ link=hide subclasses |
+ |
+
+
+ verifyElementPresent |
+ link=people |
+ |
+
+
+ verifyTextPresent |
+ Display Rank: |
+ |
+
+
+ verifyTextPresent |
+ Classes: |
|
@@ -648,9 +863,109 @@
Object Property Hierarchy |
|
+
+ verifyTextPresent |
+ Display Options |
+ |
+
verifyElementPresent |
- link=administered by |
+ link=expand all |
+ |
+
+
+ verifyElementPresent |
+ link=access provided by |
+ |
+
+
+ verifyTextPresent |
+ Local Name: |
+ |
+
+
+ verifyTextPresent |
+ Group: |
+ |
+
+
+ verifyTextPresent |
+ Domain Class: |
+ |
+
+
+ verifyTextPresent |
+ Range Class: |
+ |
+
+
+ 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=Data property hierarchy |
+ |
+
+
+ assertTitle |
+ VIVO |
+ |
+
+
+ verifyTextPresent |
+ Data Property Hierarchy |
+ |
+
+
+ verifyTextPresent |
+ Display Options |
+ |
+
+
+ verifyElementPresent |
+ id=addProperty |
+ |
+
+
+ verifyElementPresent |
+ link=expand all |
+ |
+
+
+ verifyElementPresent |
+ link=abbreviation (vivo) |
+ |
+
+
+ verifyTextPresent |
+ Local Name: |
+ |
+
+
+ verifyTextPresent |
+ Group: |
+ |
+
+
+ verifyTextPresent |
+ Domain Class: |
+ |
+
+
+ verifyTextPresent |
+ Range Class: |
|
@@ -685,42 +1000,27 @@
verifyElementPresent |
- link=overview |
- |
-
-
- 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=Ontology list |
- |
-
-
- assertTitle |
- Ontologies |
- |
-
-
- verifyTextPresent |
- Ontologies |
+ id=addProperty |
|
verifyElementPresent |
- link=VIVO core |
+ link=hide properties |
+ |
+
+
+ verifyElementPresent |
+ link=contact |
+ |
+
+
+ verifyTextPresent |
+ Display Rank: |
+ |
+
+
+ verifyTextPresent |
+ Properties: |
|
@@ -759,6 +1059,41 @@
Enter Web-accessible URL of document containing RDF to add or remove: |
|
+
+ verifyTextPresent |
+ Or upload a file from your computer: |
+ |
+
+
+ verifyElementPresent |
+ name=rdfStream |
+ |
+
+
+ verifyTextPresent |
+ add instance data (supports large data files) |
+ |
+
+
+ verifyTextPresent |
+ add mixed RDF (instances and/or ontology) |
+ |
+
+
+ verifyTextPresent |
+ remove mixed RDF (instances and/or ontology) |
+ |
+
+
+ verifyTextPresent |
+ create classgroups automatically |
+ |
+
+
+ verifyElementPresent |
+ id=submit |
+ |
+
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. |
@@ -794,6 +1129,11 @@
link=Connect DB |
|
+
+ verifyElementPresent |
+ link=Execute Workflow |
+ |
+
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. |
@@ -829,6 +1169,11 @@
Select format |
|
+
+ verifyElementPresent |
+ name=submit |
+ |
+
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. |
@@ -869,6 +1214,11 @@
Format for SELECT query results: |
|
+
+ verifyTextPresent |
+ Format for CONSTRUCT and DESCRIBE query results: |
+ |
+
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. |
@@ -904,6 +1254,21 @@
Subject |
|
+
+ verifyTextPresent |
+ Predicate |
+ |
+
+
+ verifyTextPresent |
+ Object |
+ |
+
+
+ verifyValue |
+ css=input.submit |
+ Generate Query |
+
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. |
@@ -935,11 +1300,21 @@
Search Index Status |
|
+
+ verifyTextPresent |
+ The search indexer is idle. |
+ |
+
verifyTextPresent |
The most recent update was at |
|
+
+ verifyElementPresent |
+ name=rebuild |
+ |
+
verifyTextPresent |
Reset the search index and re-populate it. |
@@ -980,6 +1355,16 @@
link=Refresh Cached Models for Visualization |
|
+
+ verifyTextPresent |
+ Why is it needed? |
+ |
+
+
+ verifyTextPresent |
+ What's involved in the caching process? |
+ |
+
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. |
@@ -1005,6 +1390,11 @@
VIVO |
|
+
+ verifyValue |
+ name=submit |
+ Recompute Inferences |
+
clickAndWait |
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html
index ea6beae1..cda4b2cd 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html
@@ -109,7 +109,7 @@
assertConfirmation |
- Are you sure you want to delete this account? |
+ Are you sure you want to delete this account?? |
|
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html
index 8b0c615a..0543f143 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html
@@ -223,7 +223,7 @@
verifyTextPresent |
- Password must be between 6 and 12 characters. |
+ Please enter a password between 6 and 12 characters in length. |
|
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html
index adf48069..7d41f5aa 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html
@@ -1,21 +1,21 @@
-
-
-
-
-
- Test Suite
-
-
-
-
-
+
+
+
+
+
+ Test Suite
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
index eaf0ab5e..3a2236dc 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
@@ -80,6 +80,11 @@
User accounts |
|
+
+ verifyTextPresent |
+ 5 accounts |
+ |
+
clickAndWait |
//input[@value='Add new account'] |
@@ -161,6 +166,11 @@
10000 |
|
+
+ verifyTextPresent |
+ 6 accounts |
+ |
+
verifyElementPresent |
link=RickRookie@cornell.edu |
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
index ee4f3fc0..2796ad99 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
@@ -98,7 +98,7 @@
assertConfirmation |
- Are you sure you want to delete this account? |
+ Are you sure you want to delete this account?? |
|
@@ -118,7 +118,7 @@
verifyTextPresent |
- Deleted 1 accounts. |
+ Deleted 1 account. |
|
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
index 4cd30713..b1d4196e 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
@@ -98,7 +98,7 @@
assertConfirmation |
- Are you sure you want to delete this account? |
+ Are you sure you want to delete this account?? |
|
@@ -118,7 +118,7 @@
verifyTextPresent |
- Deleted 1 accounts. |
+ Deleted 1 account. |
|
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
index 77f74908..35f5b031 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
@@ -98,7 +98,7 @@
assertConfirmation |
- Are you sure you want to delete this account? |
+ Are you sure you want to delete this account?? |
|
@@ -118,7 +118,7 @@
verifyTextPresent |
- Deleted 1 accounts. |
+ Deleted 1 account. |
|
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html
index 3776efcd..9edb99bf 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html
@@ -32,7 +32,6 @@
VIVO |
|
-
clickAndWait |
link=Log in |
@@ -43,6 +42,7 @@
Log in to VIVO |
|
+
type |
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
index 79d5a32c..0da8f2c2 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
@@ -83,13 +83,13 @@
verifyElementPresent |
- link=vivo:Hours |
+ link=Hours |
|
clickAndWait |
- link=vivo:Hours |
+ link=Hours |
|
@@ -107,6 +107,11 @@
Individuals in Class Hours |
|
+
+ verifyTextPresent |
+ No individuals to display |
+ |
+
verifyTextNotPresent |
@@ -147,12 +152,12 @@
verifyElementPresent |
- link=vivo:Hours |
+ link=Hours |
|
clickAndWait |
- link=vivo:Hours |
+ link=Hours |
|
@@ -171,8 +176,8 @@
|
- verifyTextPresent |
- Daytime hours |
+ verifyElementPresent |
+ link=Daytime hours |
|
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
index 68d5d665..3aa01db7 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
@@ -117,11 +117,6 @@
GroupURI |
label=Times |
-
- select |
- Namespace |
- label=VIVO core |
-
type |
LocalName |
@@ -140,7 +135,7 @@
verifyTextPresent |
- vivo:Hours |
+ Hours |
|
@@ -148,6 +143,16 @@
Times |
|
+
+ verifyTextPresent |
+ (not identified) |
+ |
+
+
+ verifyTextPresent |
+ hours |
+ |
+
verifyTextPresent |
site administrator |
@@ -155,7 +160,17 @@
verifyTextPresent |
- exact:http://vivoweb.org/ontology/core#hours |
+ -1 |
+ |
+
+
+ verifyTextPresent |
+ (unspecified) |
+ |
+
+
+ verifyTextPresent |
+ http://vivo.mydomain.edu/individual/hours |
|
@@ -170,7 +185,17 @@
verifyElementPresent |
- link=vivo:Hours |
+ link=Hours |
+ |
+
+
+ verifyTextPresent |
+ Times |
+ |
+
+
+ verifyTextPresent |
+ http://vivo.mydomain.edu/individual/ |
|
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
index 8eeb7056..2dc4b72b 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
@@ -117,11 +117,6 @@
GroupURI |
label=Times |
-
- select |
- Namespace |
- label=VIVO core |
-
type |
LocalName |
@@ -140,7 +135,7 @@
verifyTextPresent |
- vivo:Minutes |
+ Minutes |
|
@@ -148,6 +143,16 @@
Times |
|
+
+ verifyTextPresent |
+ (not identified) |
+ |
+
+
+ verifyTextPresent |
+ minutes |
+ |
+
verifyTextPresent |
editor, curator, site administrator |
@@ -155,7 +160,17 @@
verifyTextPresent |
- exact:http://vivoweb.org/ontology/core#minutes |
+ -1 |
+ |
+
+
+ verifyTextPresent |
+ (unspecified) |
+ |
+
+
+ verifyTextPresent |
+ http://vivo.mydomain.edu/individual/minutes |
|
@@ -170,7 +185,17 @@
verifyElementPresent |
- link=vivo:Minutes |
+ link=Minutes |
+ |
+
+
+ verifyTextPresent |
+ Times |
+ |
+
+
+ verifyTextPresent |
+ http://vivo.mydomain.edu/individual/ |
|
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
index f434cbaa..8cd2ad58 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
@@ -83,7 +83,7 @@
clickAndWait |
- link=vivo:Hours |
+ link=Hours |
|
@@ -162,7 +162,7 @@
clickAndWait |
- link=vivo:Hours |
+ link=Hours |
|
@@ -180,6 +180,11 @@
Individuals in Class Hours |
|
+
+ verifyTextPresent |
+ No individuals to display |
+ |
+
verifyTextNotPresent |
Daytime hours |
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
index 86ef222e..f9459124 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
@@ -83,13 +83,13 @@
verifyElementPresent |
- link=vivo:Hours |
+ link=Hours |
|
clickAndWait |
- link=vivo:Hours |
+ link=Hours |
|
@@ -131,7 +131,7 @@
verifyElementNotPresent |
- link=vivo:Hours |
+ link=Hours |
|
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
index 1136a604..29a555e4 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
@@ -83,13 +83,13 @@
verifyElementPresent |
- link=vivo:Minutes |
+ link=Minutes |
|
clickAndWait |
- link=vivo:Minutes |
+ link=Minutes |
|
@@ -131,7 +131,7 @@
verifyElementNotPresent |
- link=vivo:Minutes |
+ link=Minutes |
|
diff --git a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
index afc16f48..70afeb39 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
@@ -82,8 +82,8 @@
- verifyTextPresent |
- exact:vivo:Hours |
+ verifyElementPresent |
+ link=Hours |
|
@@ -103,13 +103,13 @@
verifyTextPresent |
- VIVO core |
+ http://vivo.mydomain.edu/individual/ |
|
clickAndWait |
- link=vivo:Hours |
+ link=Hours |
|
@@ -130,7 +130,7 @@
verifyElementPresent |
- link=exact:vivo:Hours |
+ link=Hours |
|
@@ -150,12 +150,12 @@
verifyTextPresent |
- VIVO core |
+ http://vivo.mydomain.edu/individual/ |
|
clickAndWait |
- link=exact:vivo:Hours |
+ link=Hours |
|
@@ -163,26 +163,6 @@
Class Control Panel |
|
-
- clickAndWait |
- link=Site Admin |
- |
-
-
- assertTitle |
- VIVO Site Administration |
- |
-
-
- clickAndWait |
- link=Class groups |
- |
-
-
- assertTitle |
- VIVO |
- |
-
clickAndWait |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html
index 470763ef..45c45df6 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html
@@ -111,9 +111,14 @@
|
+
+ selectWindow |
+ null |
+ |
+
clickAndWait |
- css=a.add-preferredTitle > img.add-individual |
+ css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual |
|
@@ -121,14 +126,9 @@
Edit |
|
-
- waitForElementPresent |
- tinymce |
- |
-
type |
- tinymce |
+ id=preferredTitle |
Assistant Professor |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/ReorderMenus.html b/utilities/acceptance-tests/suites/CreatePeople/ReorderMenus.html
index 0381daf6..9e9d57d6 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/ReorderMenus.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/ReorderMenus.html
@@ -80,7 +80,12 @@
Default Menu |
|
-
+
+
+ verifyTextPresent |
+ Menu Ordering |
+ |
+
verifyTextPresent |
Home |
@@ -106,6 +111,16 @@
Events |
|
+
+ verifyValue |
+ id=submit |
+ Add new menu page |
+
+
+ verifyTextPresent |
+ Refresh page after reordering menu items |
+ |
+
open |
@@ -154,7 +169,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -205,7 +220,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -256,7 +271,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -307,7 +322,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -358,7 +373,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -409,7 +424,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -460,7 +475,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -511,7 +526,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html
index a166d53d..98f5e0d0 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html
@@ -98,73 +98,78 @@
- select |
- ParentURI |
- label=dateTimeInterval (vivo) |
+ selectWindow |
+ null |
+ |
select |
- GroupURI |
+ name=ParentURI |
+ label=date/time interval (vivo) |
+
+
+ select |
+ name=GroupURI |
label=Place |
select |
- HiddenFromDisplayBelowRoleLevelUsingRoleUri |
- label=editor, curator, site administrator |
-
-
- select |
- ProhibitedFromUpdateBelowRoleLevelUsingRoleUri |
- label=site administrator |
-
-
- select |
- Namespace |
+ name=Namespace |
label=Bibontology |
type |
- LocalName |
+ name=LocalName |
visitingHours |
type |
- DomainPublic |
+ name=DomainPublic |
visiting hours |
select |
- NamespaceInverse |
+ name=NamespaceInverse |
label=Bibontology |
-
- select |
- DomainVClassURI |
- label=vivo:Museum |
-
type |
- LocalNameInverse |
+ name=LocalNameInverse |
visitingHoursFor |
type |
- RangePublic |
+ name=RangePublic |
visiting hours for |
select |
- RangeVClassURI |
- label=vivo:Date/Time Interval |
+ name=DomainVClassURI |
+ label=Museum (vivo) |
+
+
+ select |
+ name=RangeVClassURI |
+ label=Date/Time Interval (vivo) |
+
+
+ select |
+ name=HiddenFromDisplayBelowRoleLevelUsingRoleUri |
+ label=editor, curator, site administrator |
+
+
+ select |
+ name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri |
+ label=site administrator |
type |
- DomainDisplayTier |
+ name=DomainDisplayTier |
100 |
click |
- OfferCreateNewOption |
+ name=OfferCreateNewOption |
|
@@ -180,12 +185,12 @@
verifyTextPresent |
- bibo:visitingHours |
+ visiting hours (bibo) |
|
verifyElementPresent |
- link=exact:vivo:dateTimeInterval |
+ link=date/time interval (vivo) |
|
@@ -204,13 +209,18 @@
|
- verifyElementPresent |
- link=exact:vivo:Museum |
+ verifyTextPresent |
+ visiting hours |
|
verifyElementPresent |
- link=exact:vivo:Date/Time Interval |
+ link=Museum (vivo) |
+ |
+
+
+ verifyElementPresent |
+ link=Date/Time Interval (vivo) |
|
diff --git a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html
index 2e8fb188..5339884f 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html
@@ -88,7 +88,7 @@
assertTitle |
- Classgroup Editing Form |
+ Property Group Editing Form |
|
@@ -108,9 +108,19 @@
|
+
+ verifyElementPresent |
+ link=Place |
+ |
+
verifyTextPresent |
- Place |
+ Display Rank: |
+ |
+
+
+ verifyTextPresent |
+ 2 |
|
diff --git a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html
index b20ee4e6..c7d629f6 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html
@@ -83,7 +83,7 @@
clickAndWait |
- link=visiting hours |
+ link=visiting hours (bibo) |
|
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
index 8163eb03..db6af492 100644
--- a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
+++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
@@ -1,457 +1,462 @@
-
-
-
-
-
-
-AddPositions
-
-
-
-
-AddPositions |
-
-
-
- deleteAllVisibleCookies |
- |
- |
-
-
- setTimeout |
- 100000 |
- |
-
-
- open |
- /vivo/ |
- |
-
-
- assertTitle |
- VIVO |
- |
-
-
-
- clickAndWait |
- link=Log in |
- |
-
-
- assertTitle |
- Log in to VIVO |
- |
-
-
-
- type |
- loginName |
- testAdmin@cornell.edu |
-
-
- type |
- loginPassword |
- Password |
-
-
- clickAndWait |
- loginForm |
- |
-
-
-
- clickAndWait |
- link=Index |
- |
-
-
- clickAndWait |
- link=Faculty Member |
- |
-
-
- assertTitle |
- Faculty Member |
- |
-
-
- clickAndWait |
- link=Faculty, Jane |
- |
-
-
- assertTitle |
- Faculty, Jane |
- |
-
-
-
- clickAndWait |
- css=a.add-advisorIn > img.add-individual |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- verifyTextPresent |
- Create advising relationship entry for Faculty, Jane |
- |
-
-
- verifyTextPresent |
- Advising Relationship Type |
- |
-
-
- verifyTextPresent |
- Advisee: Last Name |
- |
-
-
- verifyTextPresent |
- First Name |
- |
-
-
- verifyTextPresent |
- Subject Area |
- |
-
-
- verifyTextPresent |
- Degree Candidacy |
- |
-
-
- verifyTextPresent |
- Years of Participation |
- |
-
-
- verifyTextPresent |
- Start
Year |
- |
-
-
- verifyTextPresent |
- End
Year |
- |
-
-
-
- clickAndWait |
- link=Cancel |
- |
-
-
- clickAndWait |
- css=a.add-advisorIn > img.add-individual |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
-
- select |
- id=selector |
- label=Undergraduate Advising Relationship |
-
-
- clickAndWait |
- css=input.submit |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- verifyTextPresent |
- You must enter a value in the Last Name field. |
- |
-
-
- verifyTextPresent |
- You must enter a value in the First Name field. |
- |
-
-
-
- select |
- id=selector |
- label=Undergraduate Advising Relationship |
-
-
- type |
- id=advisee |
- Smith |
-
-
- clickAndWait |
- css=input.submit |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- verifyTextPresent |
- You must enter a value in the First Name field. |
- |
-
-
-
- select |
- id=selector |
- label=Undergraduate Advising Relationship |
-
-
- type |
- id=advisee |
- |
-
-
- type |
- id=firstName |
- Joe |
-
-
- clickAndWait |
- css=input.submit |
- |
-
-
- verifyTextPresent |
- You must enter a value in the Last Name field. |
- |
-
-
-
- select |
- id=selector |
- label=Undergraduate Advising Relationship |
-
-
- type |
- id=advisee |
- Smith |
-
-
- type |
- id=firstName |
- Joe |
-
-
- clickAndWait |
- css=input.submit |
- |
-
-
-
- verifyTextPresent |
- undergraduate advising relationship |
- |
-
-
- verifyElementPresent |
- link=Smith, Joe |
- |
-
-
-
- clickAndWait |
- css=a.add-advisorIn > img.add-individual |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- select |
- id=selector |
- label=Graduate Advising Relationship |
-
-
- type |
- id=advisee |
- Doe |
-
-
- type |
- id=firstName |
- John |
-
-
- type |
- id=SubjectArea |
- Primates |
-
-
- select |
- id=degreeUri |
- label=M.S. Master of Science |
-
-
- type |
- id=startField-year |
- 2008 |
-
-
- type |
- id=endField-year |
- 2011 |
-
-
- clickAndWait |
- css=input.submit |
- |
-
-
- assertTitle |
- Faculty, Jane |
- |
-
-
-
- verifyTextPresent |
- undergraduate advising relationship |
- |
-
-
- verifyElementPresent |
- link=Smith, Joe |
- |
-
-
- verifyTextPresent |
- graduate advising relationship |
- |
-
-
- verifyTextPresent |
- Doe, John, M.S. candidate, 2008 - 2011 |
- |
-
-
- verifyElementPresent |
- link=Doe, John |
- |
-
-
-
- clickAndWait |
- css=a.add-advisorIn > img.add-individual |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- select |
- id=selector |
- label=Faculty Mentoring Relationship |
-
-
- type |
- id=advisee |
- Adams |
-
-
- type |
- id=firstName |
- Jeff |
-
-
- type |
- id=SubjectArea |
- Primate Health |
-
-
- type |
- id=startField-year |
- 2012 |
-
-
- clickAndWait |
- css=input.submit |
- |
-
-
- assertTitle |
- Faculty, Jane |
- |
-
-
-
- verifyTextPresent |
- undergraduate advising relationship |
- |
-
-
- verifyElementPresent |
- link=Smith, Joe |
- |
-
-
- verifyTextPresent |
- graduate advising relationship |
- |
-
-
- verifyTextPresent |
- Doe, John, M.S. candidate, 2008 - 2011 |
- |
-
-
- verifyElementPresent |
- link=Doe, John |
- |
-
-
- verifyTextPresent |
- faculty mentoring relationship |
- |
-
-
- verifyTextPresent |
- Adams, Jeff, 2012 - |
- |
-
-
- verifyElementPresent |
- link=Adams, Jeff |
- |
-
-
-
- clickAndWait |
- link=Home |
- |
-
-
- clickAndWait |
- link=Log out |
- |
-
-
- assertTitle |
- VIVO |
- |
-
-
-
-
+
+
+
+
+
+
+AddPositions
+
+
+
+
+AddPositions |
+
+
+
+ deleteAllVisibleCookies |
+ |
+ |
+
+
+ setTimeout |
+ 100000 |
+ |
+
+
+ open |
+ /vivo/ |
+ |
+
+
+ assertTitle |
+ VIVO |
+ |
+
+
+
+ clickAndWait |
+ link=Log in |
+ |
+
+
+ assertTitle |
+ Log in to VIVO |
+ |
+
+
+
+ type |
+ loginName |
+ testAdmin@cornell.edu |
+
+
+ type |
+ loginPassword |
+ Password |
+
+
+ clickAndWait |
+ loginForm |
+ |
+
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ clickAndWait |
+ link=Faculty Member |
+ |
+
+
+ assertTitle |
+ Faculty Member |
+ |
+
+
+ clickAndWait |
+ link=Faculty, Jane |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+
+ click |
+ //div[@id='wrapper-content']/ul/li[8] |
+ |
+
+
+ clickAndWait |
+ xpath=(//img[@alt='add'])[23] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ verifyTextPresent |
+ Create advisor relationship entry for Faculty, Jane |
+ |
+
+
+ verifyTextPresent |
+ Advising Relationship Type |
+ |
+
+
+ verifyTextPresent |
+ Advisee: Last name |
+ |
+
+
+ verifyTextPresent |
+ First name |
+ |
+
+
+ verifyTextPresent |
+ Subject Area |
+ |
+
+
+ verifyTextPresent |
+ Degree Candidacy |
+ |
+
+
+ verifyTextPresent |
+ Years of Participation |
+ |
+
+
+ verifyTextPresent |
+ Start Year |
+ |
+
+
+ verifyTextPresent |
+ End Year |
+ |
+
+
+
+ clickAndWait |
+ link=Cancel |
+ |
+
+
+ clickAndWait |
+ xpath=(//img[@alt='add'])[23] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+
+ select |
+ id=selector |
+ label=Undergraduate Advising Relationship |
+
+
+ clickAndWait |
+ css=input.submit |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ verifyTextPresent |
+ You must enter a value in the Last Name field. |
+ |
+
+
+ verifyTextPresent |
+ You must enter a value in the First Name field. |
+ |
+
+
+
+ select |
+ id=selector |
+ label=Undergraduate Advising Relationship |
+
+
+ type |
+ id=advisee |
+ Smith |
+
+
+ clickAndWait |
+ css=input.submit |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ verifyTextPresent |
+ You must enter a value in the First Name field. |
+ |
+
+
+
+ select |
+ id=selector |
+ label=Undergraduate Advising Relationship |
+
+
+ type |
+ id=advisee |
+ |
+
+
+ type |
+ id=firstName |
+ Joe |
+
+
+ clickAndWait |
+ css=input.submit |
+ |
+
+
+ verifyTextPresent |
+ You must enter a value in the Last Name field. |
+ |
+
+
+
+ select |
+ id=selector |
+ label=Undergraduate Advising Relationship |
+
+
+ type |
+ id=advisee |
+ Smith |
+
+
+ type |
+ id=firstName |
+ Joe |
+
+
+ clickAndWait |
+ css=input.submit |
+ |
+
+
+
+ verifyTextPresent |
+ undergraduate advising relationship |
+ |
+
+
+ verifyElementPresent |
+ link=Smith, Joe |
+ |
+
+
+
+ clickAndWait |
+ xpath=(//img[@alt='add'])[23] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ select |
+ id=selector |
+ label=Graduate Advising Relationship |
+
+
+ type |
+ id=advisee |
+ Doe |
+
+
+ type |
+ id=firstName |
+ John |
+
+
+ type |
+ id=SubjectArea |
+ Primates |
+
+
+ select |
+ id=degreeUri |
+ label=M.S. Master of Science |
+
+
+ type |
+ id=startField-year |
+ 2008 |
+
+
+ type |
+ id=endField-year |
+ 2011 |
+
+
+ clickAndWait |
+ css=input.submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+
+ verifyTextPresent |
+ undergraduate advising relationship |
+ |
+
+
+ verifyElementPresent |
+ link=Smith, Joe |
+ |
+
+
+ verifyTextPresent |
+ graduate advising relationship |
+ |
+
+
+ verifyTextPresent |
+ Doe, John, M.S. candidate, 2008 - 2011 |
+ |
+
+
+ verifyElementPresent |
+ link=Doe, John |
+ |
+
+
+
+ clickAndWait |
+ xpath=(//img[@alt='add'])[23] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ select |
+ id=selector |
+ label=Faculty Mentoring Relationship |
+
+
+ type |
+ id=advisee |
+ Adams |
+
+
+ type |
+ id=firstName |
+ Jeff |
+
+
+ type |
+ id=SubjectArea |
+ Primate Health |
+
+
+ type |
+ id=startField-year |
+ 2012 |
+
+
+ clickAndWait |
+ css=input.submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+
+ verifyTextPresent |
+ undergraduate advising relationship |
+ |
+
+
+ verifyElementPresent |
+ link=Smith, Joe |
+ |
+
+
+ verifyTextPresent |
+ graduate advising relationship |
+ |
+
+
+ verifyTextPresent |
+ Doe, John, M.S. candidate, 2008 - 2011 |
+ |
+
+
+ verifyElementPresent |
+ link=Doe, John |
+ |
+
+
+ verifyTextPresent |
+ faculty mentoring relationship |
+ |
+
+
+ verifyTextPresent |
+ Adams, Jeff, 2012 - |
+ |
+
+
+ verifyElementPresent |
+ link=Adams, Jeff |
+ |
+
+
+
+ clickAndWait |
+ link=Home |
+ |
+
+
+ clickAndWait |
+ link=Log out |
+ |
+
+
+ assertTitle |
+ VIVO |
+ |
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html
index ff3b5607..850e9433 100644
--- a/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html
@@ -116,9 +116,14 @@
Faculty Member |
|
+
+ selectWindow |
+ null |
+ |
+
clickAndWait |
- css=a.add-preferredTitle > img.add-individual |
+ css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual |
|
@@ -126,24 +131,14 @@
Edit |
|
-
- verifyTextPresent |
- Add new entry for: preferred title |
- |
-
-
- waitForElementPresent |
- tinymce |
- |
-
type |
- tinymce |
+ id=preferredTitle |
Assistant Professor |
clickAndWait |
- submit |
+ id=submit |
|
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
index f031e578..02f4d4da 100644
--- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
+++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
@@ -86,9 +86,14 @@
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[12] |
+ |
+
clickAndWait |
- css=a.add-awardOrHonor > img.add-individual |
+ xpath=(//img[@alt='add'])[33] |
|
@@ -108,9 +113,14 @@
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[12] |
+ |
+
clickAndWait |
- css=a.add-awardOrHonor > img.add-individual |
+ xpath=(//img[@alt='add'])[33] |
|
@@ -188,7 +198,7 @@
clickAndWait |
- css=a.add-awardOrHonor > img.add-individual |
+ xpath=(//img[@alt='add'])[33] |
|
@@ -270,7 +280,7 @@
clickAndWait |
- css=a.add-awardOrHonor > img.add-individual |
+ xpath=(//img[@alt='add'])[33] |
|
@@ -565,6 +575,11 @@
Primate Expert |
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[6] |
+ |
+
verifyElementPresent |
link=Primates-R-Us |
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html
index ff3b5607..4dc84355 100644
--- a/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html
@@ -11,6 +11,26 @@
CreateTestFacultyMember |
+
+ selectWindow |
+ null |
+ |
+
+
+ clickAndWait |
+ css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
deleteAllVisibleCookies |
@@ -118,7 +138,7 @@
clickAndWait |
- css=a.add-preferredTitle > img.add-individual |
+ css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual |
|
@@ -126,24 +146,14 @@
Edit |
|
-
- verifyTextPresent |
- Add new entry for: preferred title |
- |
-
-
- waitForElementPresent |
- tinymce |
- |
-
type |
- tinymce |
+ id=preferredTitle |
Assistant Professor |
clickAndWait |
- submit |
+ id=submit |
|
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
index 1dc09965..1be3cab9 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
@@ -85,9 +85,14 @@
Faculty, Jane |
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[12] |
+ |
+
clickAndWait |
- //h3[@id='educationalTraining']/a/img |
+ css=a.add-RO_0000056 > img.add-individual |
|
@@ -108,7 +113,12 @@
clickAndWait |
- //h3[@id='educationalTraining']/a/img |
+ css=a.add-RO_0000056 > img.add-individual |
+ |
+
+
+ assertTitle |
+ Edit |
|
@@ -197,7 +207,7 @@
select |
- degree |
+ id=degreeUri |
label=B.S. Bachelor of Science |
@@ -261,9 +271,10 @@
link=Carroll College |
|
+
clickAndWait |
- //h3[@id='educationalTraining']/a/img |
+ css=a.add-RO_0000056 > img.add-individual |
|
@@ -271,32 +282,6 @@
Edit |
|
-
- refreshAndWait |
- 10000 |
- |
-
-
- refreshAndWait |
- 10000 |
- |
-
-
- refreshAndWait |
- 10000 |
- |
-
-
- refreshAndWait |
- 10000 |
- |
-
-
- refreshAndWait |
- 10000 |
- |
-
-
select |
id=typeSelector |
@@ -319,7 +304,7 @@
select |
- degree |
+ id=degreeUri |
label=M.B.A. Master of Business Administration |
@@ -342,6 +327,31 @@
submit |
|
+
+ refreshAndWait |
+ 10000 |
+ |
+
+
+ refreshAndWait |
+ 10000 |
+ |
+
+
+ refreshAndWait |
+ 10000 |
+ |
+
+
+ refreshAndWait |
+ 10000 |
+ |
+
+
+ refreshAndWait |
+ 10000 |
+ |
+
assertTitle |
@@ -371,7 +381,12 @@
clickAndWait |
- //h3[@id='educationalTraining']/a/img |
+ css=a.add-RO_0000056 > img.add-individual |
+ |
+
+
+ assertTitle |
+ Edit |
|
@@ -379,11 +394,6 @@
id=typeSelector |
label=University |
-
- assertTitle |
- Edit |
- |
-
type |
relatedIndLabel |
@@ -396,7 +406,7 @@
select |
- degree |
+ id=degreeUri |
label=M.Ed. Master of Education |
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
index ed290ece..de31c06d 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
@@ -80,12 +80,12 @@
link=Faculty, Jane |
|
+
assertTitle |
Faculty, Jane |
|
-
verifyTextPresent |
B.S. in Business Administration, Carroll College 1980 |
@@ -104,7 +104,7 @@
clickAndWait |
- //div[@id='wrapper-content']/section[7]/article[3]/ul/li[3]/a[2]/img |
+ xpath=(//img[@alt='edit this entry'])[4] |
|
@@ -191,7 +191,7 @@
clickAndWait |
- //div[@id='wrapper-content']/section[7]/article[3]/ul/li[2]/a[2]/img |
+ xpath=(//img[@alt='edit this entry'])[3] |
|
@@ -258,7 +258,7 @@
clickAndWait |
- css=a.edit-educationalTraining > img.edit-individual |
+ css=a.edit-RO_0000056 > img.edit-individual |
|
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
index ff3b5607..8436282e 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
@@ -116,9 +116,14 @@
Faculty Member |
|
+
+ selectWindow |
+ null |
+ |
+
clickAndWait |
- css=a.add-preferredTitle > img.add-individual |
+ css=header > #ARG_2000028 > a.add-ARG_2000028 |
|
@@ -126,24 +131,14 @@
Edit |
|
-
- verifyTextPresent |
- Add new entry for: preferred title |
- |
-
-
- waitForElementPresent |
- tinymce |
- |
-
type |
- tinymce |
+ id=preferredTitle |
Assistant Professor |
clickAndWait |
- submit |
+ id=submit |
|
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
index 4646f5cd..0ed441b8 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
@@ -107,9 +107,14 @@
|
+
+ selectWindow |
+ null |
+ |
+
clickAndWait |
- css=a.delete-educationalTraining > img.delete-individual |
+ css=a.delete-RO_0000056 > img.delete-individual |
|
@@ -119,7 +124,7 @@
clickAndWait |
- submit |
+ id=submit |
|
@@ -129,7 +134,7 @@
clickAndWait |
- css=a.delete-educationalTraining > img.delete-individual |
+ css=a.delete-RO_0000056 > img.delete-individual |
|
@@ -139,7 +144,7 @@
clickAndWait |
- submit |
+ id=submit |
|
@@ -149,7 +154,7 @@
clickAndWait |
- css=a.delete-educationalTraining > img.delete-individual |
+ css=a.delete-RO_0000056 > img.delete-individual |
|
@@ -159,7 +164,7 @@
clickAndWait |
- submit |
+ id=submit |
|
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html
index cb6171b7..fa0077d0 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html
@@ -47,11 +47,21 @@
carroll - VIVO Search Results |
|
+
+ verifyTextPresent |
+ Carroll College College |
+ |
+
verifyElementPresent |
link=Carroll College |
|
+
+ verifyTextPresent |
+ Carroll University University |
+ |
+
verifyElementPresent |
link=Carroll University |
@@ -77,11 +87,21 @@
wisconsin - VIVO Search Results |
|
+
+ verifyTextPresent |
+ University of Wisconsin University |
+ |
+
verifyElementPresent |
link=University of Wisconsin |
|
+
+ verifyTextPresent |
+ Wisconsin State or Province |
+ |
+
verifyElementPresent |
link=Wisconsin |
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html
index ff3b5607..850e9433 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html
@@ -116,9 +116,14 @@
Faculty Member |
|
+
+ selectWindow |
+ null |
+ |
+
clickAndWait |
- css=a.add-preferredTitle > img.add-individual |
+ css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual |
|
@@ -126,24 +131,14 @@
Edit |
|
-
- verifyTextPresent |
- Add new entry for: preferred title |
- |
-
-
- waitForElementPresent |
- tinymce |
- |
-
type |
- tinymce |
+ id=preferredTitle |
Assistant Professor |
clickAndWait |
- submit |
+ id=submit |
|
diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
index 27fedd3c..3e0a91e6 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
@@ -32,6 +32,142 @@
VIVO |
|
+
+
+ verifyTextPresent |
+ Welcome to VIVO |
+ |
+
+
+ verifyTextPresent |
+ VIVO is a research-focused discovery tool that enables collaboration among scientists across all disciplines. |
+ |
+
+
+ verifyTextPresent |
+ Browse or search information on people, departments, courses, grants, and grants. |
+ |
+
+
+ verifyTextPresent |
+ Log in |
+ |
+
+
+ verifyTextPresent |
+ Email |
+ |
+
+
+ verifyTextPresent |
+ Password |
+ |
+
+
+ verifyValue |
+ name=loginForm |
+ Log in |
+
+
+ verifyElementPresent |
+ name=loginForm |
+ |
+
+
+ verifyTextPresent |
+ Search VIVO |
+ |
+
+
+ verifyValue |
+ css=input.search |
+ Search |
+
+
+ verifyElementPresent |
+ css=input.search |
+ |
+
+
+ verifyElementPresent |
+ css=h4 |
+ |
+
+
+ verifyTextPresent |
+ No research content found. |
+ |
+
+
+ verifyElementPresent |
+ css=#home-faculty-mbrs > h4 |
+ |
+
+
+ verifyTextPresent |
+ No faculty members found. |
+ |
+
+
+ verifyElementPresent |
+ css=#home-academic-depts > h4 |
+ |
+
+
+ verifyTextPresent |
+ No academic departments found. |
+ |
+
+
+ verifyElementPresent |
+ css=#home-stats > h4 |
+ |
+
+
+ verifyElementPresent |
+ css=p.stats-count |
+ |
+
+
+ verifyTextPresent |
+ ©2013 VIVO Project |
+ |
+
+
+ verifyElementPresent |
+ link=Terms of Use |
+ |
+
+
+ verifyTextPresent |
+ Powered by VIVO |
+ |
+
+
+ verifyElementPresent |
+ link=VIVO |
+ |
+
+
+ verifyTextNotPresent |
+ Version |
+ |
+
+
+ verifyElementNotPresent |
+ link=unknown |
+ |
+
+
+ verifyElementPresent |
+ link=About |
+ |
+
+
+ verifyElementPresent |
+ link=Support |
+ |
+
clickAndWait |
@@ -59,6 +195,132 @@
loginForm |
|
+
+
+ verifyTextPresent |
+ Welcome to VIVO |
+ |
+
+
+ verifyTextPresent |
+ VIVO is a research-focused discovery tool that enables collaboration among scientists across all disciplines. |
+ |
+
+
+ verifyTextPresent |
+ Browse or search information on people, departments, courses, grants, and grants. |
+ |
+
+
+ verifyTextNotPresent |
+ Log in |
+ |
+
+
+ verifyTextNotPresent |
+ Email |
+ |
+
+
+ verifyTextNotPresent |
+ Password |
+ |
+
+
+ verifyTextPresent |
+ Search VIVO |
+ |
+
+
+ verifyValue |
+ css=input.search |
+ Search |
+
+
+ verifyElementPresent |
+ css=input.search |
+ |
+
+
+ verifyElementPresent |
+ css=h4 |
+ |
+
+
+ verifyTextPresent |
+ No research content found. |
+ |
+
+
+ verifyElementPresent |
+ css=#home-faculty-mbrs > h4 |
+ |
+
+
+ verifyTextPresent |
+ No faculty members found. |
+ |
+
+
+ verifyElementPresent |
+ css=#home-academic-depts > h4 |
+ |
+
+
+ verifyTextPresent |
+ No academic departments found. |
+ |
+
+
+ verifyElementPresent |
+ css=#home-stats > h4 |
+ |
+
+
+ verifyElementPresent |
+ css=p.stats-count |
+ |
+
+
+ verifyTextPresent |
+ ©2013 VIVO Project |
+ |
+
+
+ verifyElementPresent |
+ link=Terms of Use |
+ |
+
+
+ verifyTextPresent |
+ Powered by VIVO |
+ |
+
+
+ verifyElementPresent |
+ link=VIVO |
+ |
+
+
+ verifyTextPresent |
+ Version rel-1.6-rc1 |
+ |
+
+
+ verifyElementPresent |
+ link=rel-1.6-rc1 |
+ |
+
+
+ verifyElementPresent |
+ link=About |
+ |
+
+
+ verifyElementPresent |
+ link=Support |
+ |
+
clickAndWait |
@@ -80,16 +342,137 @@
Site Information |
|
+
+
+ verifyTextPresent |
+ Site Information |
+ |
+
+
+ verifyTextPresent |
+ Editing Existing Record |
+ |
+
+
+ verifyTextPresent |
+ Site name (max 50 characters) |
+ |
+
+
+ verifyValue |
+ name=ApplicationName |
+ VIVO |
+
+
+ verifyElementPresent |
+ name=ApplicationName |
+ |
+
+
+ verifyTextPresent |
+ Contact email address contact form submissions will be sent to this address |
+ |
+
+
+ verifyValue |
+ name=ContactMail |
+ |
+
+
+ verifyElementPresent |
+ name=ContactMail |
+ |
+
+
+ verifyTextPresent |
+ Theme |
+ |
+
+
+ verifyElementPresent |
+ id=ThemeDir |
+ |
+
+
+ verifyTextPresent |
+ Copyright text used in footer (e.g., name of your institution) |
+ |
+
+
+ verifyValue |
+ name=CopyrightAnchor |
+ VIVO Project |
+
+
+ verifyElementPresent |
+ name=CopyrightAnchor |
+ |
+
+
+ verifyTextPresent |
+ Copyright URL copyright text links to this URL |
+ |
+
+
+ verifyValue |
+ name=CopyrightURL |
+ |
+
+
+ verifyElementPresent |
+ name=CopyrightURL |
+ |
+
+
+ verifyValue |
+ id=primaryAction |
+ Save changes |
+
+
+ verifyElementPresent |
+ id=primaryAction |
+ |
+
+
+ verifyValue |
+ name=_cancel |
+ Cancel |
+
+
+ verifyElementPresent |
+ name=_cancel |
+ |
+
type |
ApplicationName |
VIVO Test Site |
+
+ type |
+ name=ContactMail |
+ hlm7@cornell.edu |
+
+
+ select |
+ id=ThemeDir |
+ label=vitro |
+
+
+ select |
+ id=ThemeDir |
+ label=wilma |
+
type |
CopyrightAnchor |
- VIVO Project 2012 |
+ VIVO Project 2013 |
+
+
+ type |
+ CopyrightURL |
+ vivoweb.org |
clickAndWait |
@@ -111,17 +494,48 @@
link=Home |
|
+
assertTitle |
VIVO Test Site |
|
-
verifyTextPresent |
- VIVO Project 2012 |
+ VIVO Project 2013 |
|
+
+ verifyTextPresent |
+ ©2013 |
+ |
+
+
+ verifyElementPresent |
+ link=VIVO Project 2013 |
+ |
+
+
+ verifyElementPresent |
+ link=Terms of Use |
+ |
+
+
+ verifyTextPresent |
+ Powered by VIVO |
+ |
+
+
+ verifyElementPresent |
+ link=VIVO |
+ |
+
+
+ verifyTextPresent |
+ Version rel-1.6-rc1 |
+ |
+
+
clickAndWait |
link=Site Admin |
@@ -142,17 +556,36 @@
Site Information |
|
-
type |
ApplicationName |
VIVO |
+
+ type |
+ name=ContactMail |
+ |
+
+
+ select |
+ id=ThemeDir |
+ label=vitro |
+
+
+ select |
+ id=ThemeDir |
+ label=wilma |
+
type |
CopyrightAnchor |
VIVO Project |
+
+ type |
+ name=CopyrightURL |
+ |
+
clickAndWait |
primaryAction |
@@ -174,6 +607,46 @@
VIVO Project |
|
+
+ assertTitle |
+ VIVO |
+ |
+
+
+ verifyTextPresent |
+ VIVO Project |
+ |
+
+
+ verifyTextPresent |
+ ©2013 VIVO Project |
+ |
+
+
+ verifyElementPresent |
+ link=Terms of Use |
+ |
+
+
+ verifyTextPresent |
+ Powered by VIVO |
+ |
+
+
+ verifyElementPresent |
+ link=VIVO |
+ |
+
+
+ verifyTextPresent |
+ Version rel-1.6-rc1 |
+ |
+
+
+ verifyElementPresent |
+ link=rel-1.6-rc1 |
+ |
+
clickAndWait |
diff --git a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html
index 75e3f290..0150889b 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html
@@ -126,10 +126,15 @@
Locations |
|
+
+ verifyTextPresent |
+ Test HTML Page |
+ |
+
clickAndWait |
- css=img[alt="delete"] |
+ xpath=(//img[@alt='delete this page'])[2] |
|
@@ -139,7 +144,7 @@
click |
- css=img[alt="delete"] |
+ xpath=(//img[@alt='delete this page'])[4] |
|
@@ -159,7 +164,7 @@
click |
- css=img[alt="delete"] |
+ xpath=(//img[@alt='delete this page'])[6] |
|
@@ -179,7 +184,7 @@
click |
- xpath=(//img[@alt='delete'])[3] |
+ xpath=(//img[@alt='delete this page'])[7] |
|
@@ -199,7 +204,7 @@
click |
- xpath=(//img[@alt='delete'])[7] |
+ xpath=(//img[@alt='delete this page'])[11] |
|
@@ -263,6 +268,11 @@
Locations |
|
+
+ verifyTextNotPresent |
+ Test HTML Page |
+ |
+
clickAndWait |
diff --git a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
index 7f5e708e..a79ab8fe 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
@@ -93,17 +93,27 @@
verifyTextPresent |
- Title |
+ Add New Page |
|
verifyTextPresent |
- Content Type |
+ Title * |
|
verifyTextPresent |
- Pretty URL |
+ Content Type * |
+ |
+
+
+ verifyTextPresent |
+ Add one or more types |
+ |
+
+
+ verifyTextPresent |
+ Pretty URL * |
|
@@ -123,7 +133,12 @@
verifyTextPresent |
- Custom template |
+ Custom template requiring content |
+ |
+
+
+ verifyTextPresent |
+ Custom template containing all content |
|
@@ -141,13 +156,18 @@
If left blank, the page title will be used. |
|
+
+ verifyTextPresent |
+ Select page permissions |
+ |
+
verifyElementPresent |
link=Cancel |
|
- click |
+ clickAndWait |
id=cancelPage |
|
@@ -156,11 +176,6 @@
10000 |
|
-
- assertTitle |
- Edit |
- |
-
clickAndWait |
link=Site Admin |
@@ -722,7 +737,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -773,7 +788,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -824,7 +839,7 @@
verifyElementPresent |
- link=rebuilding the search index |
+ link=Try rebuilding the search index |
|
@@ -848,6 +863,46 @@
Continent |
|
+
+ pause |
+ 10000 |
+ |
+
+
+ verifyElementPresent |
+ link=Africa |
+ |
+
+
+ verifyElementPresent |
+ link=Asia |
+ |
+
+
+ verifyElementPresent |
+ link=Australia and New Zealand |
+ |
+
+
+ verifyElementPresent |
+ link=Europe |
+ |
+
+
+ verifyElementPresent |
+ link=northern America |
+ |
+
+
+ verifyElementPresent |
+ link=Oceania |
+ |
+
+
+ verifyElementPresent |
+ link=South America |
+ |
+
clickAndWait |
diff --git a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
index e1199fb0..8746ed9e 100644
--- a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
+++ b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
@@ -80,6 +80,21 @@
Ontologies |
|
+
+ verifyTextPresent |
+ Ontology |
+ |
+
+
+ verifyTextPresent |
+ Namespace |
+ |
+
+
+ verifyTextPresent |
+ Prefix |
+ |
+
verifyTextNotPresent |