diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyClassAutolink.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyClassAutolink.html
index 4e9cfe6d..2655d328 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyClassAutolink.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyClassAutolink.html
@@ -41,12 +41,12 @@
open |
- /vivo/siteAdmin?home=1&login=block |
+ /vivo/ |
|
assertTitle |
- VIVO Site Administration |
+ VIVO |
|
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
index 7e2e5ddd..7a4c039b 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
@@ -121,12 +121,12 @@
clickAndWait |
- link=Jane Faculty |
+ link=Faculty, Jane |
|
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -161,12 +161,12 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
clickAndWait |
- //div[@id='dprop-vitro-description']/a |
+ //div[@id='overview']/a |
|
@@ -186,12 +186,57 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
clickAndWait |
- //div[@id='overview']/a |
+ //div[@id='hasCollaborator']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ //div[@id='hasCollaborator']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='currentlyHeadOf']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ select |
+ typeOfNew |
+ label=Foundation (core) |
+
+
+ clickAndWait |
+ submit |
|
@@ -201,8 +246,8 @@
type |
- tinymce |
- What can I say that hasn't been said already? |
+ name |
+ Primates-R-Us |
clickAndWait |
@@ -211,7 +256,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -236,7 +281,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -261,7 +306,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -286,7 +331,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -316,7 +361,77 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='advisorIn']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ name |
+ Primates-R-Us Fellowship |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='teaches']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ name |
+ Introduction to Primates 101 |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
|
@@ -341,7 +456,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -366,7 +481,47 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='adviseeIn']/a |
+ |
+
+
+ |
+ |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ //input[@id='submit' and @value='add a new item to this list'] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ name |
+ Primates Foundation of America |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
|
@@ -396,57 +551,7 @@
assertTitle |
- Jane Faculty |
- |
-
-
- clickAndWait |
- //div[@id='freetextKeyword']/a |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- type |
- tinymce |
- Apes |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- Jane Faculty |
- |
-
-
- clickAndWait |
- //div[@id='freetextKeyword']/a |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- type |
- tinymce |
- Primates |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -476,32 +581,7 @@
assertTitle |
- Jane Faculty |
- |
-
-
- clickAndWait |
- //div[@id='firstName']/a |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- type |
- tinymce |
- Jane |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -526,12 +606,12 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
clickAndWait |
- //div[@id='lastName']/a |
+ //div[@id='workPhone']/a |
|
@@ -542,7 +622,7 @@
type |
tinymce |
- Faculty |
+ 607-255-5555 |
clickAndWait |
@@ -551,7 +631,212 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='workFax']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ 607-244-4444 |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='workEmail']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ mejane@africa.com |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='mailingAddress']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ //input[@id='submit' and @value='add a new item to this list'] |
+ |
+
+
+ type |
+ name |
+ The Jungle, Africa, 12345678 |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='prefixName']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ Ms. |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='suffixName']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ III |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='orcidId']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ 1234 |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='scopusId']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ 5678 |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='researcherId']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ 123456789 |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
|
@@ -781,7 +1066,57 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='freetextKeyword']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ Apes |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='freetextKeyword']/a |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ Primates |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
|
@@ -804,9 +1139,24 @@
I am named after Jane in the Tarzan stories. |
|
+
+ verifyElementPresent |
+ link=Faculty, Jane |
+ |
+
verifyTextPresent |
- What can I say that hasn't been said already? |
+ Assistant Professor |
+ |
+
+
+ verifyElementPresent |
+ link=Primates-R-Us |
+ |
+
+
+ verifyTextPresent |
+ Foundation |
|
@@ -839,6 +1189,26 @@
Subject Area |
|
+
+ verifyElementPresent |
+ link=Primates-R-Us Fellowship |
+ |
+
+
+ verifyTextPresent |
+ Advising Relationship |
+ |
+
+
+ verifyElementPresent |
+ link=Introduction to Primates 101 |
+ |
+
+
+ verifyTextPresent |
+ Semester Class |
+ |
+
verifyTextPresent |
I teach monkeys to communicate. |
@@ -849,6 +1219,16 @@
I travel the country teaching monkeys in zoos how to communicate. |
|
+
+ verifyElementPresent |
+ link=Primates Foundation of America |
+ |
+
+
+ verifyTextPresent |
+ Advising Relationship |
+ |
+
verifyElementPresent |
link=Monkey Trainer of the Year |
@@ -859,16 +1239,6 @@
Award or Honor |
|
-
- verifyTextPresent |
- Apes |
- |
-
-
- verifyTextPresent |
- Primates |
- |
-
verifyElementPresent |
link=exact:http://primates.com/ |
@@ -944,6 +1314,16 @@
123456789 |
|
+
+ verifyTextPresent |
+ Apes |
+ |
+
+
+ verifyTextPresent |
+ Primates |
+ |
+
comment |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddLibrarianClassAutolink.html b/utilities/acceptance-tests/suites/CreatePeople/AddLibrarianClassAutolink.html
index 91422d3b..ba9a6088 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddLibrarianClassAutolink.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddLibrarianClassAutolink.html
@@ -166,22 +166,22 @@
clickAndWait |
- link=Index |
+ link=People |
|
assertTitle |
- Index to VIVO Contents |
+ People |
|
clickAndWait |
- link=Librarian |
+ link=Librarians |
|
assertTitle |
- Librarian |
+ Librarians |
|
diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
index 591cb8d2..60ee3365 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
@@ -121,12 +121,12 @@
clickAndWait |
- link=Jane Faculty |
+ link=Faculty, Jane |
|
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -161,12 +161,12 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
clickAndWait |
- //div[@id='dprop-vitro-description']/div/div/div/span/a[1] |
+ //div[@id='overview']/div/div/span/span/a[1] |
|
@@ -186,12 +186,47 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
clickAndWait |
- //div[@id='overview']/div/div/span/span/a[1] |
+ //div[@id='hasCollaborator']/ul/li/span/span/a[1] |
+ |
+
+
+ |
+ |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='currentlyHeadOf']/ul/li/span/span/a[1] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ //input[@id='submit' and @value='add a new item to this list'] |
|
@@ -201,8 +236,8 @@
type |
- tinymce |
- What can I say? |
+ name |
+ Primates Rock and Roll |
clickAndWait |
@@ -211,7 +246,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -236,7 +271,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -261,7 +296,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -291,7 +326,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -326,7 +361,82 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='advisorIn']/ul/li/span/span/a[1] |
+ |
+
+
+ |
+ |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ //input[@id='submit' and @value='add a new item to this list'] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ name |
+ Primate Foundation of Africa |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='teaches']/ul/li/span/span/a[1] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ //input[@id='submit' and @value='add a new item to this list'] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ name |
+ Intermediate Primates 201 |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
|
@@ -351,7 +461,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -376,7 +486,42 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='adviseeIn']/ul/li/span/span/a[1] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ clickAndWait |
+ //input[@id='submit' and @value='add a new item to this list'] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ name |
+ Primates Unite |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
|
@@ -411,57 +556,7 @@
assertTitle |
- Jane Faculty |
- |
-
-
- clickAndWait |
- //div[@id='freetextKeyword']/div/ul/li[1]/span/span/a[1] |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- type |
- tinymce |
- African Primates |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- Jane Faculty |
- |
-
-
- clickAndWait |
- //div[@id='freetextKeyword']/div/ul/li[2]/span/span/a[1] |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- type |
- tinymce |
- African Apes |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -496,7 +591,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -521,7 +616,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -546,7 +641,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -571,7 +666,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -596,7 +691,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -621,7 +716,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -646,7 +741,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -681,7 +776,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -706,7 +801,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -731,7 +826,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -756,7 +851,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -781,7 +876,7 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
|
@@ -806,7 +901,57 @@
assertTitle |
- Jane Faculty |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='freetextKeyword']/div/ul/li[1]/span/span/a[1] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ African Primates |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
+ |
+
+
+ clickAndWait |
+ //div[@id='freetextKeyword']/div/ul/li[2]/span/span/a[1] |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ tinymce |
+ African Apes |
+
+
+ clickAndWait |
+ submit |
+ |
+
+
+ assertTitle |
+ Faculty, Jane |
|
@@ -829,9 +974,24 @@
I am named after Jane in the Tarzan stories. Yes, my last name really is faculty. |
|
+
+ verifyElementPresent |
+ link=Faculty, Jane |
+ |
+
verifyTextPresent |
- What can I say? |
+ Assistant Professor |
+ |
+
+
+ verifyElementPresent |
+ link=Primates Rock and Roll |
+ |
+
+
+ verifyTextPresent |
+ Academic Department |
|
@@ -859,6 +1019,26 @@
Subject Area |
|
+
+ verifyElementPresent |
+ link=Primate Foundation of Africa |
+ |
+
+
+ verifyTextPresent |
+ Advising Relationship |
+ |
+
+
+ verifyElementPresent |
+ link=Intermediate Primates 201 |
+ |
+
+
+ verifyTextPresent |
+ Semester Class |
+ |
+
verifyTextPresent |
I teach apes how to communicate with humans. |
@@ -869,6 +1049,16 @@
I travel the world teaching apes how to communicate with humans. |
|
+
+ verifyElementPresent |
+ link=Primates Unite |
+ |
+
+
+ verifyTextPresent |
+ Advising Relationship |
+ |
+
verifyElementPresent |
link=Ape Trainer of the Decade |
@@ -879,16 +1069,6 @@
Award or Honor |
|
-
- verifyTextPresent |
- African Apes |
- |
-
-
- verifyTextPresent |
- African Primates |
- |
-
verifyElementPresent |
link=exact:http://primates-r-us.com |
@@ -964,6 +1144,16 @@
3333333 |
|
+
+ verifyTextPresent |
+ African Apes |
+ |
+
+
+ verifyTextPresent |
+ African Primates |
+ |
+
comment |
diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html b/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html
index 5e3dc10d..192aa495 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html
@@ -79,11 +79,26 @@
jane - VIVO Search Results |
|
+
+ verifyElementPresent |
+ link=people |
+ |
+
+
+ verifyElementPresent |
+ link=Faculty, Jane |
+ |
+
verifyTextPresent |
Faculty, Jane |
|
+
+ verifyTextPresent |
+ Assistant Professor |
+ |
+
comment |
@@ -104,11 +119,26 @@
faculty - VIVO Search Results |
|
+
+ verifyElementPresent |
+ link=people |
+ |
+
+
+ verifyElementPresent |
+ link=Faculty, Jane |
+ |
+
verifyTextPresent |
Faculty, Jane |
|
+
+ verifyTextPresent |
+ Assistant Professor |
+ |
+
comment |
@@ -129,9 +159,24 @@
jane faculty - VIVO Search Results |
|
+
+ verifyElementPresent |
+ link=people |
+ |
+
+
+ verifyElementPresent |
+ link=Faculty, Jane |
+ |
+
verifyTextPresent |
- Jane Faculty |
+ Faculty, Jane |
+ |
+
+
+ verifyTextPresent |
+ Assistant Professor |
|
@@ -154,11 +199,26 @@
lily - VIVO Search Results |
|
+
+ verifyElementPresent |
+ link=people |
+ |
+
+
+ verifyElementPresent |
+ link=Librarian, Lily |
+ |
+
verifyTextPresent |
Librarian, Lily |
|
+
+ verifyTextPresent |
+ Assistant Librarian |
+ |
+
comment |
@@ -179,11 +239,26 @@
librarian - VIVO Search Results |
|
+
+ verifyElementPresent |
+ link=people |
+ |
+
+
+ verifyElementPresent |
+ link=Librarian, Lily |
+ |
+
verifyTextPresent |
Librarian, Lily |
|
+
+ verifyTextPresent |
+ Assistant Librarian |
+ |
+
comment |
@@ -204,9 +279,24 @@
lily librarian - VIVO Search Results |
|
+
+ verifyElementPresent |
+ link=people |
+ |
+
+
+ verifyElementPresent |
+ link=Librarian, Lily |
+ |
+
verifyTextPresent |
- Lily Librarian |
+ Librarian, Lily |
+ |
+
+
+ verifyTextPresent |
+ Assistant Librarian |
|