diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html
new file mode 100644
index 00000000..e0a1d5dc
--- /dev/null
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+CreateFacultyMember
+
+
+
+
+
+CreateFacultyMember |
+
+
+ deleteAllVisibleCookies |
+ |
+ |
+
+
+ comment |
+
+ |
+
+
+ open |
+ /vivo/ |
+ |
+
+
+ assertTitle |
+ VIVO |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Log in |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ comment |
+
+ |
+
+
+ type |
+ loginName |
+ testAdmin |
+
+
+ type |
+ loginPassword |
+ Password |
+
+
+ clickAndWait |
+ loginForm |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ verifyTextPresent |
+ Data Input |
+ |
+
+
+ select |
+ VClassURI |
+ label=Faculty Member (core) |
+
+
+ clickAndWait |
+ //input[@value='Add individual of this class'] |
+ |
+
+
+ comment |
+
+ |
+
+
+ type |
+ firstName |
+ Jane |
+
+
+ type |
+ lastName |
+ Faculty |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ clickAndWait |
+ //input[@value='Edit This Individual'] |
+ |
+
+
+ assertTitle |
+ Individual Editing Form |
+ |
+
+
+ type |
+ MonikerSelectAlt |
+ Assistant Professor |
+
+
+ clickAndWait |
+ primaryAction |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ comment |
+
+ |
+
+
+ verifyTextPresent |
+ Faculty, Jane |
+ |
+
+
+ verifyTextPresent |
+ Assistant Professor |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Log out |
+ |
+
+
+ assertTitle |
+ VIVO |
+ |
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
new file mode 100644
index 00000000..078637b5
--- /dev/null
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+CreateLibrarian
+
+
+
+
+
+CreateLibrarian |
+
+
+ deleteAllVisibleCookies |
+ |
+ |
+
+
+ comment |
+
+ |
+
+
+ open |
+ /vivo/ |
+ |
+
+
+ assertTitle |
+ VIVO |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Log in |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ comment |
+
+ |
+
+
+ type |
+ loginName |
+ testAdmin |
+
+
+ type |
+ loginPassword |
+ Password |
+
+
+ clickAndWait |
+ loginForm |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ comment |
+
+ |
+
+
+ select |
+ VClassURI |
+ label=Librarian (core) |
+
+
+ clickAndWait |
+ //input[@value='Add individual of this class'] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ verifyTextPresent |
+ Create a new Librarian |
+ |
+
+
+ comment |
+
+ |
+
+
+ type |
+ firstName |
+ Lily |
+
+
+ type |
+ lastName |
+ Librarian |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Librarian, Lily |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ clickAndWait |
+ //input[@value='Edit This Individual'] |
+ |
+
+
+ assertTitle |
+ Individual Editing Form |
+ |
+
+
+ type |
+ MonikerSelectAlt |
+ Assistant Librarian |
+
+
+ clickAndWait |
+ primaryAction |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ comment |
+
+ |
+
+
+ verifyTextPresent |
+ Librarian, Lily |
+ |
+
+
+ verifyTextPresent |
+ Assistant Librarian |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index to VIVO Contents |
+ |
+
+
+ verifyTextPresent |
+ Librarian |
+ |
+
+
+ clickAndWait |
+ link=Librarian |
+ |
+
+
+ assertTitle |
+ Librarian |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Log out |
+ |
+
+
+ assertTitle |
+ VIVO |
+ |
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
index 70c4ed21..60d05e0a 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
@@ -1434,6 +1434,71 @@
link=Index |
|
+
+ clickAndWait |
+ link=Organization |
+ |
+
+
+ assertTitle |
+ Organization |
+ |
+
+
+ clickAndWait |
+ link=Primate College of America |
+ |
+
+
+ assertTitle |
+ Primate College of America |
+ |
+
+
+ clickAndWait |
+ link=edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ clickAndWait |
+ //input[@value='Edit This Individual'] |
+ |
+
+
+ assertTitle |
+ Individual Editing Form |
+ |
+
+
+ click |
+ _delete |
+ |
+
+
+ assertConfirmation |
+ Are you SURE you want to delete this entity? If in doubt, CANCEL. |
+ |
+
+
+ waitForPageToLoad |
+ 5000 |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
assertTitle |
Index to VIVO Contents |
@@ -1829,6 +1894,11 @@
equipment |
|
+
+ verifyTextNotPresent |
+ Building |
+ |
+
verifyTextPresent |
locations |
diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
index 0038b57a..eb6680a7 100644
--- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
+++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
@@ -397,7 +397,7 @@
type |
datafile |
- C:\vivo-code\vivo\utilities\acceptance-tests\suites\AddPublications\nintendo-logo.jpg |
+ C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\AddPublications\nintendo-logo.jpg |
clickAndWait |
@@ -432,7 +432,7 @@
type |
datafile |
- C:\vivo-code\vivo\utilities\acceptance-tests\suites\AddPublications\nintendo-logo.jpg |
+ C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\AddPublications\nintendo-logo.jpg |
clickAndWait |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html
index 186cb54c..6f4e9884 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html
@@ -246,7 +246,7 @@
comment |
-
+
|
@@ -256,7 +256,7 @@
comment |
-
+
|
@@ -334,6 +334,106 @@
//img[@title='click to view larger image']@src |
/vivo/file/*/thumbnail_lily2.jpg |
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ //div[@id='dprop-vitro-image']/div/div/div/span/a[1] |
+ |
+
+
+ comment |
+
+ |
+
+
+ type |
+ datafile |
+ C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily3.png |
+
+
+ clickAndWait |
+ //input[@value='Upload photo'] |
+ |
+
+
+ assertTitle |
+ Crop Photo for Librarian, Lily |
+ |
+
+
+ clickAndWait |
+ //input[@value='Save photo'] |
+ |
+
+
+ assertTitle |
+ Librarian, Lily |
+ |
+
+
+ comment |
+
+ |
+
+
+ verifyAttribute |
+ //img[@title='click to view larger image']@src |
+ /vivo/file/*/thumbnail_lily3.jpg |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ //div[@id='dprop-vitro-image']/div/div/div/span/a[1] |
+ |
+
+
+ comment |
+
+ |
+
+
+ type |
+ datafile |
+ C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\lily4.gif |
+
+
+ clickAndWait |
+ //input[@value='Upload photo'] |
+ |
+
+
+ assertTitle |
+ Crop Photo for Librarian, Lily |
+ |
+
+
+ clickAndWait |
+ //input[@value='Save photo'] |
+ |
+
+
+ assertTitle |
+ Librarian, Lily |
+ |
+
+
+ comment |
+
+ |
+
+
+ verifyAttribute |
+ //img[@title='click to view larger image']@src |
+ /vivo/file/*/thumbnail_lily4.jpg |
+
comment |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/lily3.png b/utilities/acceptance-tests/suites/CreatePeople/lily3.png
new file mode 100644
index 00000000..16d18373
Binary files /dev/null and b/utilities/acceptance-tests/suites/CreatePeople/lily3.png differ
diff --git a/utilities/acceptance-tests/suites/CreatePeople/lily4.gif b/utilities/acceptance-tests/suites/CreatePeople/lily4.gif
new file mode 100644
index 00000000..79cca2c9
Binary files /dev/null and b/utilities/acceptance-tests/suites/CreatePeople/lily4.gif differ
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
index 885897c6..2c228fbd 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
@@ -69,11 +69,31 @@
lecturer - VIVO Search Results |
|
+
+ verifyTextPresent |
+ Search Results for 'lecturer' |
+ |
+
+
+ verifyElementPresent |
+ link=people |
+ |
+
+
+ verifyElementPresent |
+ link=organizations |
+ |
+
verifyElementPresent |
link=Carroll College |
|
+
+ verifyTextPresent |
+ Carroll College | College |
+ |
+
verifyTextPresent |
... people Lecturer ... |
@@ -86,7 +106,12 @@
verifyTextPresent |
- Faculty, Jane | Assistant Professor |
+ Faculty, Jane | Assistant Professor |
+ |
+
+
+ verifyTextPresent |
+ ... positions Assistant Professor positions Professor positions Lecturer ... |
|
@@ -109,9 +134,19 @@
professor - VIVO Search Results |
|
+
+ verifyTextPresent |
+ Search Results for 'professor' |
+ |
+
verifyElementPresent |
- link=Carroll University |
+ link=people |
+ |
+
+
+ verifyElementPresent |
+ link=organizations |
|
@@ -119,6 +154,31 @@
link=Faculty, Jane |
|
+
+ verifyTextPresent |
+ Faculty, Jane | Assistant Professor |
+ |
+
+
+ verifyTextPresent |
+ ... positions Assistant Professor positions Professor positions Lecturer ... |
+ |
+
+
+ verifyElementPresent |
+ link=Carroll University |
+ |
+
+
+ verifyTextPresent |
+ Carroll University | University |
+ |
+
+
+ verifyTextPresent |
+ ... people Professor people Assistant Professor ... |
+ |
+
comment |
@@ -139,41 +199,41 @@
carroll - VIVO Search Results |
|
+
+ verifyTextPresent |
+ Search Results for 'carroll' |
+ |
+
+
+ verifyElementPresent |
+ link=organizations |
+ |
+
verifyElementPresent |
link=Carroll College |
|
+
+ verifyTextPresent |
+ Carroll College | College |
+ |
+
verifyElementPresent |
link=Carroll University |
|
+
+ verifyTextPresent |
+ Carroll University | University |
+ |
+
comment |
|
-
- type |
- search |
- carroll college |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- carroll college - VIVO Search Results |
- |
-
-
- verifyTextPresent |
- Carroll College |
- |
-
clickAndWait |
link=Carroll College |
@@ -184,20 +244,10 @@
Carroll College |
|
-
- verifyTextNotPresent |
- Faculty, Jane |
- |
-
-
- comment |
-
- |
-
type |
search |
- carroll university |
+ carroll |
clickAndWait |
@@ -206,12 +256,12 @@
assertTitle |
- carroll university - VIVO Search Results |
+ carroll - VIVO Search Results |
|
- verifyTextPresent |
- Carroll University |
+ comment |
+
|
@@ -225,13 +275,18 @@
|
- verifyElementPresent |
+ verifyTextPresent |
+ Faculty Position |
+ |
+
+
+ assertElementPresent |
link=Faculty, Jane |
|
verifyTextPresent |
- Faculty, Jane Professor, 1986 - |
+ Faculty, Jane Professor, 1986 - |
|
@@ -254,16 +309,36 @@
university - VIVO Search Results |
|
+
+ verifyTextPresent |
+ Search Results for 'university' |
+ |
+
+
+ verifyElementPresent |
+ link=organizations |
+ |
+
verifyElementPresent |
link=Cornell University |
|
+
+ verifyTextPresent |
+ Cornell University | University |
+ |
+
verifyElementPresent |
link=Carroll University |
|
+
+ verifyTextPresent |
+ Carroll University | University |
+ |
+
comment |
diff --git a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
index c0027114..c3691fd0 100644
--- a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
+++ b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
@@ -171,7 +171,7 @@
clickAndWait |
- //input[@value='Show All Ontologies'] |
+ //input[@value='All Ontologies'] |
|