diff --git a/utilities/acceptance-tests/suites/AddPublications/AddConference.html b/utilities/acceptance-tests/suites/AddPublications/AddConference.html
index ca9ac4c2..5980aacb 100644
--- a/utilities/acceptance-tests/suites/AddPublications/AddConference.html
+++ b/utilities/acceptance-tests/suites/AddPublications/AddConference.html
@@ -478,6 +478,16 @@
link=Conference Paper |
|
+
+ verifyTextPresent |
+ Journal (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Journal |
+ |
+
clickAndWait |
diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html b/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html
index a81773a1..30181d85 100644
--- a/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html
+++ b/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html
@@ -180,6 +180,16 @@
link=Conference Paper |
|
+
+ verifyTextPresent |
+ Journal (1) |
+ |
+
+
+ verifyElementPresent |
+ link=Journal |
+ |
+
clickAndWait |
diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html
index c209f16e..7c724659 100644
--- a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html
@@ -147,31 +147,11 @@
link=Sony, Sunny |
|
-
- verifyTextPresent |
- 765 |
- |
-
-
- verifyTextPresent |
- 13 |
- |
-
-
- verifyTextPresent |
- 876 |
- |
-
verifyElementPresent |
link=Marcel Dekker |
|
-
- verifyTextPresent |
- New York |
- |
-
verifyElementPresent |
link=Child Development |
@@ -179,7 +159,17 @@
verifyTextPresent |
- Child Development |
+ 13 |
+ |
+
+
+ verifyElementPresent |
+ link=Kids in the 21st Century |
+ |
+
+
+ verifyTextPresent |
+ Children |
|
@@ -189,7 +179,17 @@
verifyTextPresent |
- Children |
+ 765 |
+ |
+
+
+ verifyTextPresent |
+ 876 |
+ |
+
+
+ verifyTextPresent |
+ New York |
|
@@ -279,16 +279,6 @@
link=Furter, Frank |
|
-
- verifyElementPresent |
- link=Putnam |
- |
-
-
- verifyTextPresent |
- New York |
- |
-
verifyElementPresent |
link=in press |
@@ -300,8 +290,8 @@
|
- verifyTextPresent |
- 258 |
+ verifyElementPresent |
+ link=Putnam |
|
@@ -309,6 +299,16 @@
link=Child Development |
|
+
+ verifyTextPresent |
+ Children |
+ |
+
+
+ verifyTextPresent |
+ Games |
+ |
+
verifyTextPresent |
5555555555 |
@@ -321,12 +321,12 @@
verifyTextPresent |
- Games |
+ 258 |
|
verifyTextPresent |
- Children |
+ New York |
|
@@ -355,44 +355,34 @@
Too Much Nintendo |
|
-
- verifyTextPresent |
- Supplement |
- |
-
verifyElementPresent |
link=Furter, Frank |
|
-
- verifyTextPresent |
- 29 |
- |
-
-
- verifyTextPresent |
- 298 |
- |
-
-
- verifyTextPresent |
- 344 |
- |
-
verifyTextPresent |
2010 |
|
- verifyTextPresent |
- 987654321.1234567890 |
+ verifyElementPresent |
+ link=Child Development |
+ |
+
+
+ verifyElementPresent |
+ link=Child Development |
|
verifyTextPresent |
- ABC111222333 |
+ Children |
+ |
+
+
+ verifyTextPresent |
+ Games |
|
@@ -411,18 +401,33 @@
|
- verifyElementPresent |
- link=Child Development |
+ verifyTextPresent |
+ 987654321.1234567890 |
|
verifyTextPresent |
- Children |
+ ABC111222333 |
|
verifyTextPresent |
- Games |
+ 298 |
+ |
+
+
+ verifyTextPresent |
+ 344 |
+ |
+
+
+ verifyTextPresent |
+ 29 |
+ |
+
+
+ verifyTextPresent |
+ Supplement |
|
@@ -528,7 +533,7 @@
verifyElementPresent |
- link=exact:Nintendo: Good or Bad for Kids? |
+ link=Nintendo: Good or Bad for Kids? |
|
@@ -562,10 +567,20 @@
|
- verifyElementPresent |
+ click |
link=Conference Paper (1) |
|
+
+ pause |
+ 5000 |
+ |
+
+
+ verifyElementPresent |
+ link=Nintendo Case Studies |
+ |
+
click |
link=Journal (1) |
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html
index cd684da3..3dc72603 100644
--- a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html
@@ -347,6 +347,76 @@
link=Index |
|
+
+ clickAndWait |
+ link=Journal |
+ |
+
+
+ assertTitle |
+ Journal |
+ |
+
+
+ clickAndWait |
+ link=Child Development |
+ |
+
+
+ assertTitle |
+ Child Development |
+ |
+
+
+ clickAndWait |
+ link=Edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ clickAndWait |
+ //input[@value='Edit This Individual'] |
+ |
+
+
+ assertTitle |
+ Individual Editing Form |
+ |
+
+
+ click |
+ name=_delete |
+ |
+
+
+ assertConfirmation |
+ Are you SURE you want to delete this individual? If in doubt, CANCEL. |
+ |
+
+
+ waitForPageToLoad |
+ 5000 |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
pause |
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
index 89248bba..1f7f7f10 100644
--- a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
+++ b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
@@ -71,6 +71,11 @@
people |
|
+
+ verifyTextPresent |
+ activities |
+ |
+
verifyTextPresent |
events |
@@ -542,7 +547,7 @@
link=Index |
|
-
+
clickAndWait |
link=Competition |
@@ -843,6 +848,216 @@
Index of Contents |
|
+
+ clickAndWait |
+ link=Service |
+ |
+
+
+ assertTitle |
+ Service |
+ |
+
+
+ clickAndWait |
+ link=Kids Now Conference |
+ |
+
+
+ assertTitle |
+ Kids Now Conference |
+ |
+
+
+ clickAndWait |
+ link=Edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ clickAndWait |
+ //input[@value='Edit This Individual'] |
+ |
+
+
+ assertTitle |
+ Individual Editing Form |
+ |
+
+
+ click |
+ name=_delete |
+ |
+
+
+ assertConfirmation |
+ Are you SURE you want to delete this individual? If in doubt, CANCEL. |
+ |
+
+
+ waitForPageToLoad |
+ 5000 |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
+
+ clickAndWait |
+ link=Book |
+ |
+
+
+ assertTitle |
+ Book |
+ |
+
+
+ clickAndWait |
+ link=Raising Children in the 21st Century |
+ |
+
+
+ assertTitle |
+ Raising Children in the 21st Century |
+ |
+
+
+ clickAndWait |
+ link=Edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ clickAndWait |
+ //input[@value='Edit This Individual'] |
+ |
+
+
+ assertTitle |
+ Individual Editing Form |
+ |
+
+
+ click |
+ name=_delete |
+ |
+
+
+ assertConfirmation |
+ Are you SURE you want to delete this individual? If in doubt, CANCEL. |
+ |
+
+
+ waitForPageToLoad |
+ 5000 |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
+
+ clickAndWait |
+ link=Chapter |
+ |
+
+
+ assertTitle |
+ Chapter |
+ |
+
+
+ clickAndWait |
+ link=Kids Now Conference Proceedings |
+ |
+
+
+ assertTitle |
+ Kids Now Conference Proceedings |
+ |
+
+
+ clickAndWait |
+ link=Edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ clickAndWait |
+ //input[@value='Edit This Individual'] |
+ |
+
+
+ assertTitle |
+ Individual Editing Form |
+ |
+
+
+ click |
+ name=_delete |
+ |
+
+
+ assertConfirmation |
+ Are you SURE you want to delete this individual? If in doubt, CANCEL. |
+ |
+
+
+ waitForPageToLoad |
+ 5000 |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
refreshAndWait |
10000 |
@@ -876,7 +1091,12 @@
verifyTextNotPresent |
- topics |
+ research |
+ |
+
+
+ verifyTextNotPresent |
+ activities |
|
@@ -889,11 +1109,6 @@
organizations |
|
-
- verifyTextNotPresent |
- publications |
- |
-
clickAndWait |
diff --git a/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html b/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html
index 1c657d6b..5a1744e9 100644
--- a/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html
+++ b/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html
@@ -141,7 +141,7 @@
verifyTextPresent |
- Child Development |
+ Child Development Journal |
|
@@ -207,7 +207,7 @@
verifyTextPresent |
- Child Development |
+ Child Development Journal |
|
diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
index 62ddaf8a..36f7fde8 100644
--- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
+++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
@@ -172,7 +172,7 @@
- click |
+ clickAndWait |
link=Cancel |
|
@@ -666,16 +666,6 @@
submit |
|
-
- assertTitle |
- Nintendo O.K. for Kids |
- |
-
-
- clickAndWait |
- css=img.add-individual |
- |
-
assertTitle |
Edit |
@@ -892,66 +882,10 @@
Mouse, Minnie |
|
-
-
- verifyTextPresent |
- Add new entry for: chapter |
- |
-
-
- verifyTextPresent |
- A chapter number. NOT to be used for the chapter title, which should be entered in the "name" field instead (the field in bold at the top of the page) |
- |
-
-
- clickAndWait |
- link=Cancel |
- |
-
-
- pause |
- 10000 |
- |
-
-
- assertTitle |
- Nintendo O.K. for Kids |
- |
-
-
- clickAndWait |
- //h3[@id='chapter']/a/img |
- |
-
-
- assertTitle |
- Edit |
- |
-
-
- waitForElementPresent |
- tinymce |
- |
-
-
- type |
- tinymce |
- 15 |
-
-
- clickAndWait |
- submit |
- |
-
-
- assertTitle |
- Nintendo O.K. for Kids |
- |
-
clickAndWait |
- //h3[@id='features']/a/img |
+ css=a.add-features > img.add-individual |
|
@@ -961,7 +895,7 @@
verifyTextPresent |
- Add an entry to: features |
+ Select an existing Agent for Nintendo O.K. for Kids |
|
@@ -991,7 +925,7 @@
verifyTextPresent |
- Add an entry to: features |
+ Select an existing Agent for Nintendo O.K. for Kids |
|
@@ -1316,7 +1250,7 @@
select |
typeOfNew |
- label=Document Part (bibo) |
+ label=Chapter (bibo) |
clickAndWait |
@@ -1356,7 +1290,12 @@
verifyTextPresent |
- Add an entry to: part of |
+ Select an existing Document for Nintendo O.K. for Kids |
+ |
+
+
+ verifyTextPresent |
+ If you don't find the appropriate entry on the selection list above: |
|
@@ -1381,8 +1320,18 @@
select |
- id=objectVar |
- label=Nintendo O.K. for Kids |
+ id=typeOfNew |
+ label=Book (bibo) |
+
+
+ clickAndWait |
+ id=offerCreate |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
type |
@@ -1948,12 +1897,27 @@
select |
- objectVar |
- label=Nintendo: Good or Bad for Kids? |
+ id=typeOfNew |
+ label=Book (bibo) |
clickAndWait |
- submit |
+ id=offerCreate |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
+
+ type |
+ id=name |
+ Nintendo: Good or Bad for Kids? |
+
+
+ clickAndWait |
+ id=submit |
|
@@ -2111,8 +2075,9 @@
type |
id=name |
- Kids |
+ Kids Now C |
+
click |
id=ui-active-menuitem |
@@ -2333,8 +2298,9 @@
type |
id=name |
- Kids Now |
+ Kids Now C |
+
click |
id=ui-active-menuitem |
@@ -2353,7 +2319,7 @@
clickAndWait |
- css=a.add-BFO_0000050 > img.add-individual |
+ css=a.add-RO_0002353 > img.add-individual |
|
@@ -2363,7 +2329,7 @@
verifyTextPresent |
- Add an entry to: part of |
+ Select an existing Process for Nintendo O.K. for Kids |
|
@@ -2388,7 +2354,7 @@
clickAndWait |
- css=a.add-partOf > img.add-individual |
+ css=a.add-RO_0002353 > img.add-individual |
|
@@ -2396,6 +2362,11 @@
Edit |
|
+
+ select |
+ id=objectVar |
+ label=Kids Now! |
+
clickAndWait |
id=submit |
@@ -2419,12 +2390,7 @@
verifyTextPresent |
- Select an existing Information Content Entity for Nintendo O.K. for Kids |
- |
-
-
- verifyTextPresent |
- Information Content Entity Name |
+ Select an existing Document for Nintendo O.K. for Kids |
|
@@ -2459,12 +2425,7 @@
verifyTextPresent |
- Select an existing Information Content Entity for Nintendo O.K. for Kids |
- |
-
-
- verifyTextPresent |
- Information Content Entity Name |
+ Select an existing Document for Nintendo O.K. for Kids |
|
@@ -2477,6 +2438,11 @@
link=Cancel |
|
+
+ select |
+ id=typeOfNew |
+ label=Academic Article (bibo) |
+
clickAndWait |
id=offerCreate |
@@ -2492,6 +2458,11 @@
link=Cancel |
|
+
+ assertTitle |
+ Edit |
+ |
+
verifyTextPresent |
Create "cited by" entry for Nintendo O.K. for Kids |
@@ -2538,6 +2509,11 @@
link=Cancel |
|
+
+ select |
+ id=typeOfNew |
+ label=Academic Article (bibo) |
+
clickAndWait |
id=offerCreate |
@@ -2573,6 +2549,11 @@
Edit |
|
+
+ select |
+ id=typeOfNew |
+ label=Academic Article (bibo) |
+
clickAndWait |
id=offerCreate |
@@ -2599,19 +2580,19 @@
|
-
- verifyElementPresent |
- //img[@title='click to view larger image'] |
- |
-
verifyElementPresent |
link=Company Homepage |
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[12] |
+ |
+
verifyTextPresent |
- Company Homepage |
+ This is a chapter in a book that provides various professional viewpoints as to the impact of Nintendo usage on kids. |
|
@@ -2625,13 +2606,123 @@
|
- verifyTextPresent |
- 1 |
+ verifyElementPresent |
+ link=Mouse, Minnie |
+ |
+
+
+ verifyElementPresent |
+ link=published |
|
verifyTextPresent |
- 9 |
+ 2009 |
+ |
+
+
+ verifyElementPresent |
+ link=Marcel Dekker |
+ |
+
+
+ verifyElementPresent |
+ link=Child Development |
+ |
+
+
+ verifyElementPresent |
+ link=Kids Now Conference Proceedings |
+ |
+
+
+ verifyElementPresent |
+ link=Nintendo: Good or Bad for Kids? |
+ |
+
+
+ verifyTextPresent |
+ 15 |
+ |
+
+
+ verifyTextPresent |
+ Mouse, Minnie Person |
+ |
+
+
+ verifyElementPresent |
+ link=Mouse, Minnie |
+ |
+
+
+ verifyElementPresent |
+ link=Raising Children in the 21st Century |
+ |
+
+
+ verifyElementPresent |
+ link=United States of America |
+ |
+
+
+ verifyElementPresent |
+ link=Kids Now Conference |
+ |
+
+
+ verifyElementPresent |
+ link=Kids Now! |
+ |
+
+
+ verifyElementPresent |
+ link=Kids Now Conference |
+ |
+
+
+ verifyElementPresent |
+ link=Kids Now! |
+ |
+
+
+ verifyTextPresent |
+ Children |
+ |
+
+
+ verifyElementPresent |
+ link=Kids Today |
+ |
+
+
+ verifyElementPresent |
+ link=Children Today |
+ |
+
+
+ verifyElementPresent |
+ link=Kids of the 21st Century |
+ |
+
+
+ verifyTextPresent |
+ 1234-5678-90 |
+ |
+
+
+ verifyTextPresent |
+ 123456789 |
+ |
+
+
+ verifyTextPresent |
+ 99 |
+ |
+
+
+ verifyTextPresent |
+ 22 |
|
@@ -2646,17 +2737,7 @@
verifyTextPresent |
- Mouse, Minnie |
- |
-
-
- verifyElementPresent |
- link=Marcel Dekker |
- |
-
-
- verifyTextPresent |
- Marcel Dekker |
+ 1 |
|
@@ -2664,126 +2745,16 @@
New York |
|
-
- verifyTextPresent |
- This is a chapter in a book that provides various professional viewpoints as to the impact of Nintendo usage on kids. |
- |
-
-
- verifyElementPresent |
- link=Raising Children in the 21st Century |
- |
-
-
- verifyTextPresent |
- Raising Children in the 21st Century |
- |
-
-
- verifyElementPresent |
- link=Kids Now! |
- |
-
-
- verifyTextPresent |
- Kids Now! |
- |
-
-
- verifyElementPresent |
- link=published |
- |
-
-
- verifyTextPresent |
- published |
- |
-
-
- verifyElementPresent |
- link=Kids Now Conference Proceedings |
- |
-
-
- verifyTextPresent |
- Kids Now Conference Proceedings |
- |
-
-
- verifyElementPresent |
- link=exact:Nintendo: Good or Bad for Kids? |
- |
-
-
- verifyTextPresent |
- Nintendo: Good or Bad for Kids? |
- |
-
-
- verifyElementPresent |
- link=United States of America |
- |
-
-
- verifyTextPresent |
- 2009 |
- |
-
-
- verifyTextPresent |
- 123456789 |
- |
-
-
- verifyTextPresent |
- 1234-5678-90 |
- |
-
-
- verifyTextPresent |
- 15 |
- |
-
-
- verifyTextPresent |
- 22 |
- |
-
-
- verifyElementPresent |
- link=Child Development |
- |
-
-
- verifyTextPresent |
- Child Development |
- |
-
-
- verifyTextPresent |
- Children |
- |
-
verifyElementPresent |
link=Nintendo: Good or Bad for Kids? |
|
-
- verifyTextPresent |
- Nintendo: Good or Bad for Kids? |
- |
-
verifyElementPresent |
link=Kids Now Conference Proceedings |
|
-
- verifyTextPresent |
- Kids Now Conference Proceedings |
- |
-
clickAndWait |
@@ -2807,22 +2778,12 @@
verifyTextPresent |
- research |
+ activities |
|
verifyTextPresent |
- Book (2) |
- |
-
-
- verifyTextPresent |
- Chapter (1) |
- |
-
-
- verifyTextPresent |
- Concept (1) |
+ Service (1) |
|
@@ -2830,11 +2791,21 @@
events |
|
+
+ verifyTextPresent |
+ Competition (1) |
+ |
+
verifyTextPresent |
Conference (1) |
|
+
+ verifyTextPresent |
+ Event (2) |
+ |
+
verifyTextPresent |
organizations |
@@ -2850,6 +2821,36 @@
Publisher (1) |
|
+
+ verifyTextPresent |
+ research |
+ |
+
+
+ verifyTextPresent |
+ Academic Article (3) |
+ |
+
+
+ verifyTextPresent |
+ Article (3) |
+ |
+
+
+ verifyTextPresent |
+ Book (2) |
+ |
+
+
+ verifyTextPresent |
+ Chapter (2) |
+ |
+
+
+ verifyTextPresent |
+ Concept (1) |
+ |
+
clickAndWait |
@@ -2877,6 +2878,11 @@
|
+
+ click |
+ css=li.nonSelectedGroupTab.clickable |
+ |
+
verifyTextPresent |
chapter |
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
index 9d0082d4..134db85d 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
@@ -233,7 +233,7 @@
|
- click |
+ clickAndWait |
link=Cancel |
|
@@ -1128,6 +1128,11 @@
Research |
|
+
+ pause |
+ 5000 |
+ |
+
verifyElementPresent |
link=Grant (5) |
@@ -1179,10 +1184,15 @@
|
- clickAndWait |
+ click |
css=a[alt="view all faculty"] |
|
+
+ pause |
+ 5000 |
+ |
+
assertTitle |
People |
@@ -1208,6 +1218,11 @@
link=Faculty Member (1) |
|
+
+ pause |
+ 5000 |
+ |
+
verifyElementPresent |
link=Faculty, Jane |
@@ -1223,6 +1238,11 @@
link=Librarian (1) |
|
+
+ pause |
+ 5000 |
+ |
+
verifyElementPresent |
link=Librarian, Lily |
@@ -1238,6 +1258,11 @@
link=Person (2) |
|
+
+ pause |
+ 5000 |
+ |
+
verifyElementPresent |
link=Faculty, Jane |
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
index e84eaa70..ff077c35 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
@@ -148,7 +148,7 @@
label=Conference |
- click |
+ clickAndWait |
link=Cancel |
|
@@ -255,6 +255,11 @@
|
+
+ click |
+ css=li.nonSelectedGroupTab.clickable |
+ |
+
verifyTextPresent |
PoA Annual Conference 2000 - 2010 |
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
index 74b39942..b0b98552 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
@@ -178,7 +178,7 @@
|
- click |
+ clickAndWait |
link=Cancel |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html
index cc721b86..cb4949fc 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html
@@ -57,7 +57,7 @@
click |
- //div[@id='wrapper-content']/ul/li[8] |
+ //div[@id='wrapper-content']/ul/li[10] |
|
@@ -244,7 +244,7 @@
click |
- //div[@id='wrapper-content']/ul/li[8] |
+ //div[@id='wrapper-content']/ul/li[10] |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
index b90d153a..cf1801ab 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
@@ -152,11 +152,6 @@
LITA |
|
-
- click |
- //div[@id='wrapper-content']/ul/li[16] |
- |
-
click |
css=li.selectedGroupTab.clickable |
@@ -226,7 +221,7 @@
- click |
+ clickAndWait |
//input[@value='Delete'] |
|
@@ -310,7 +305,7 @@
click |
- //div[@id='wrapper-content']/ul/li[20] |
+ //div[@id='wrapper-content']/ul/li[18] |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html
index 4d244da2..e9b5e2ad 100644
--- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html
@@ -73,7 +73,12 @@
verifyTextPresent |
- Project |
+ Project (2) |
+ |
+
+
+ verifyTextPresent |
+ Service (1) |
|
@@ -83,37 +88,32 @@
verifyTextPresent |
- Course |
+ Course (1) |
|
verifyTextPresent |
- events |
+ Conference (3) |
|
verifyTextPresent |
- Conference |
+ Event (7) |
|
verifyTextPresent |
- Event |
+ Invited Talk (1) |
|
verifyTextPresent |
- Invited Talk |
+ Presentation (2) |
|
verifyTextPresent |
- Presentation |
- |
-
-
- verifyTextPresent |
- Workshop |
+ Workshop (1) |
|
@@ -123,37 +123,37 @@
verifyTextPresent |
- Association |
+ Association (4) |
|
verifyTextPresent |
- College |
+ College (1) |
|
verifyTextPresent |
- Committee |
+ Committee (1) |
|
verifyTextPresent |
- Department |
+ Department (1) |
|
verifyTextPresent |
- Group |
+ Group (1) |
|
verifyTextPresent |
- Museum |
+ Museum (1) |
|
verifyTextPresent |
- Organization |
+ Organization (7) |
|
@@ -163,7 +163,7 @@
verifyTextPresent |
- Grant |
+ Grant (5) |
|
@@ -302,6 +302,81 @@
link=Index |
|
+
+ selectWindow |
+ null |
+ |
+
+
+ clickAndWait |
+ link=Service |
+ |
+
+
+ assertTitle |
+ Service |
+ |
+
+
+ clickAndWait |
+ link=Ape Health Program |
+ |
+
+
+ assertTitle |
+ Ape Health Program |
+ |
+
+
+ clickAndWait |
+ link=Edit this individual |
+ |
+
+
+ assertTitle |
+ Individual Control Panel |
+ |
+
+
+ clickAndWait |
+ //input[@value='Edit This Individual'] |
+ |
+
+
+ assertTitle |
+ Individual Editing Form |
+ |
+
+
+ click |
+ name=_delete |
+ |
+
+
+ assertConfirmation |
+ Are you SURE you want to delete this individual? If in doubt, CANCEL. |
+ |
+
+
+ waitForPageToLoad |
+ 5000 |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
clickAndWait |
@@ -1340,7 +1415,7 @@
VIVO Site Administration |
|
-
+
clickAndWait |
link=Index |
diff --git a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
index 75a7e161..07fa2af9 100644
--- a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
+++ b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
@@ -194,7 +194,7 @@
|
- click |
+ clickAndWait |
xpath=(//input[@type='checkbox'])[6] |
|
@@ -241,8 +241,8 @@
- verifyTextPresent |
- manage grants & projects |
+ verifyElementPresent |
+ link=manage grants & projects |
|
@@ -271,7 +271,7 @@
|
- clickAndWait |
+ click |
link=Return to Profile Page |
|
@@ -343,7 +343,7 @@
|
- clickAndWait |
+ click |
link=Return to Profile Page |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
index cfc8ecd2..f63e51d0 100644
--- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
+++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
@@ -347,11 +347,6 @@
Librarians for the Better Treatment of Primates Committee |
|
-
- verifyTextPresent |
- Reference Division Department |
- |
-
verifyElementPresent |
link=Librarian, Lily |
@@ -362,11 +357,6 @@
link=Librarians for the Better Treatment of Primates |
|
-
- verifyElementPresent |
- link=Reference Division |
- |
-
type |
@@ -503,12 +493,12 @@
verifyTextPresent |
- VIVO Cornell Grant Too Grant |
+ VIVO Cornell Grant Grant |
|
verifyTextPresent |
- VIVO Cornell Grant Grant |
+ VIVO Cornell Grant Too Grant |
|
@@ -528,12 +518,12 @@
verifyElementPresent |
- link=VIVO Cornell Grant Too |
+ link=VIVO Cornell Grant |
|
verifyElementPresent |
- link=VIVO Cornell Grant |
+ link=VIVO Cornell Grant Too |
|