diff --git a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html
index 60524519..05ce4a54 100644
--- a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html
+++ b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html
@@ -31,7 +31,7 @@
comment |
-
+
|
@@ -86,112 +86,412 @@
clickAndWait |
- loginForm |
- |
-
-
- clickAndWait |
- link=Site Admin |
+ name=loginForm |
|
assertTitle |
- VIVO Site Administration |
- |
-
-
- verifyTextPresent |
- Data Input |
- |
-
-
- select |
- VClassURI |
- label=Faculty Member (vivo) |
-
-
- clickAndWait |
- //input[@value='Add individual of this class'] |
- |
-
-
- assertTitle |
- Edit |
+ VIVO |
|
comment |
-
+
|
-
- type |
- firstName |
- Jane |
-
-
- type |
- lastName |
- Faculty |
-
clickAndWait |
- submit |
- |
-
-
- comment |
-
+ link=Index |
|
assertTitle |
- Faculty, Jane |
+ Index of Contents |
|
- assertTextPresent |
+ clickAndWait |
+ link=Faculty Member |
+ |
+
+
+ assertTitle |
Faculty Member |
|
- clickAndWait |
- css=a.add-preferredTitle > img.add-individual |
- |
-
-
- assertTitle |
- Edit |
+ verifyTextPresent |
+ Faculty Member |
|
verifyTextPresent |
- Add new entry for: preferred title |
+ Baker, Able Professor |
|
- waitForElementPresent |
- tinymce |
+ verifyElementPresent |
+ link=Baker, Able |
|
- type |
- tinymce |
- Assistant Professor |
+ verifyTextPresent |
+ Dog, Charlie Member of Department A |
+ |
+
+
+ verifyElementPresent |
+ link=Dog, Charlie |
+ |
+
+
+ verifyElementPresent |
+ link=Foxtrot, Echo |
+ |
+
+
+ verifyElementPresent |
+ link=Henry, George |
+ |
+
+
+ comment |
+
+ |
clickAndWait |
- submit |
+ link=Index |
|
assertTitle |
- Faculty, Jane |
+ Index of Contents |
|
- assertTextPresent |
- Assistant Professor |
+ clickAndWait |
+ link=Person |
+ |
+
+
+ assertTitle |
+ Person |
+ |
+
+
+ verifyTextPresent |
+ Person |
+ |
+
+
+ verifyTextPresent |
+ Baker, Able Professor |
+ |
+
+
+ verifyElementPresent |
+ link=Baker, Able |
+ |
+
+
+ verifyTextPresent |
+ Dog, Charlie Faculty Member Member of Department A |
+ |
+
+
+ verifyElementPresent |
+ link=Dog, Charlie |
+ |
+
+
+ verifyTextPresent |
+ Foxtrot, Echo Faculty Member |
+ |
+
+
+ verifyElementPresent |
+ link=Foxtrot, Echo |
+ |
+
+
+ verifyTextPresent |
+ Henry, George Faculty Member |
+ |
+
+
+ verifyElementPresent |
+ link=Henry, George |
+ |
+
+
+ verifyElementPresent |
+ link=Jenkins, Iris |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=People |
+ |
+
+
+ assertTitle |
+ People |
+ |
+
+
+ click |
+ link=Faculty Member (4) |
+ |
+
+
+ verifyElementPresent |
+ link=Baker, Able |
+ |
+
+
+ verifyTextPresent |
+ Professor |
+ |
+
+
+ verifyElementPresent |
+ link=Dog, Charlie |
+ |
+
+
+ verifyTextPresent |
+ Member of Department A |
+ |
+
+
+ verifyElementPresent |
+ link=Foxtrot, Echo |
+ |
+
+
+ verifyTextPresent |
+ Foxtrot, Echo |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Person (5) |
+ |
+
+
+ verifyElementPresent |
+ link=Baker, Able |
+ |
+
+
+ verifyTextPresent |
+ Professor |
+ |
+
+
+ verifyElementPresent |
+ link=Dog, Charlie |
+ |
+
+
+ verifyTextPresent |
+ Faculty Member |
+ |
+
+
+ verifyTextPresent |
+ Member of Department A |
+ |
+
+
+ verifyElementPresent |
+ link=Foxtrot, Echo |
+ |
+
+
+ verifyTextPresent |
+ Faculty Member |
+ |
+
+
+ verifyElementPresent |
+ link=Henry, George |
+ |
+
+
+ verifyTextPresent |
+ Faculty Member |
+ |
+
+
+ verifyElementPresent |
+ link=Jenkins, Iris |
+ |
+
+
+ comment |
+
+ |
+
+
+ type |
+ name=querytext |
+ person |
+
+
+ clickAndWait |
+ css=input.search |
+ |
+
+
+ assertTitle |
+ person - VIVO Search Results |
+ |
+
+
+ verifyTextPresent |
+ Jenkins, Iris Person |
+ |
+
+
+ verifyElementPresent |
+ link=Jenkins, Iris |
+ |
+
+
+ verifyTextPresent |
+ Baker, Able Professor |
+ |
+
+
+ verifyElementPresent |
+ link=Baker, Able |
+ |
+
+
+ verifyTextPresent |
+ Dog, Charlie Faculty Member Member of Department A |
+ |
+
+
+ verifyElementPresent |
+ link=Dog, Charlie |
+ |
+
+
+ verifyTextPresent |
+ Foxtrot, Echo Faculty Member |
+ |
+
+
+ verifyElementPresent |
+ link=Foxtrot, Echo |
+ |
+
+
+ verifyTextPresent |
+ Henry, George Faculty Member |
+ |
+
+
+ verifyElementPresent |
+ link=Henry, George |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
+
+ clickAndWait |
+ link=Academic Department |
+ |
+
+
+ assertTitle |
+ Academic Department |
+ |
+
+
+ verifyTextPresent |
+ Academic Department |
+ |
+
+
+ verifyElementPresent |
+ link=Department A |
+ |
+
+
+ verifyElementPresent |
+ link=Department B |
+ |
+
+
+ comment |
+
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
+
+ clickAndWait |
+ link=Organization |
+ |
+
+
+ assertTitle |
+ Organization |
+ |
+
+
+ verifyTextPresent |
+ Organization |
+ |
+
+
+ verifyElementPresent |
+ link=Department A |
+ |
+
+
+ verifyTextPresent |
+ Department B Academic Department |
+ |
+
+
+ verifyElementPresent |
+ link=Department B |
|
diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
index 3a5c8a31..df42f7f2 100644
--- a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
+++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
@@ -149,6 +149,11 @@
Edit |
|
+
+ waitForElementPresent |
+ tinymce |
+ |
+
type |
tinymce |
@@ -229,6 +234,11 @@
id=activity |
Depart |
+
+ comment |
+
+ |
+
click |
id=ui-active-menuitem |
@@ -314,6 +324,11 @@
id=activity |
Depart |
+
+ comment |
+
+ |
+
click |
id=ui-active-menuitem |
@@ -439,6 +454,31 @@
link=Index |
|
+
+ refreshAndWait |
+ 10000 |
+ |
+
+
+ refreshAndWait |
+ 10000 |
+ |
+
+
+ refreshAndWait |
+ 10000 |
+ |
+
+
+ refreshAndWait |
+ 10000 |
+ |
+
+
+ refreshAndWait |
+ 10000 |
+ |
+
assertTitle |
Index of Contents |
@@ -519,131 +559,6 @@
link=Jenkins, Iris |
|
-
- clickAndWait |
- link=Faculty Member |
- |
-
-
- assertTitle |
- Faculty Member |
- |
-
-
- clickAndWait |
- link=Foxtrot, Echo |
- |
-
-
- assertTitle |
- Foxtrot, Echo |
- |
-
-
- clickAndWait |
- link=Index |
- |
-
-
- assertTitle |
- Index of Contents |
- |
-
-
- clickAndWait |
- link=Department |
- |
-
-
- assertTitle |
- Department |
- |
-
-
- assertTitle |
- Index of Contents |
- |
-
-
- clickAndWait |
- link=Academic Department |
- |
-
-
- assertTitle |
- Academic Department |
- |
-
-
- assertTitle |
- Index of Contents |
- |
-
-
- clickAndWait |
- link=Organization |
- |
-
-
- assertTitle |
- Organization |
- |
-
-
- assertTitle |
- Index of Contents |
- |
-
-
- clickAndWait |
- link=Building |
- |
-
-
- assertTitle |
- Building |
- |
-
-
- assertTitle |
- Index of Contents |
- |
-
-
- assertTitle |
- phpMyAdmin 3.4.5 - localhost |
- |
-
-
- selectFrame |
- frame_navigation |
- |
-
-
- clickAndWait |
- link=vivo |
- |
-
-
- selectWindow |
- name=frame_content |
- |
-
-
- click |
- link=Check All |
- |
-
-
- selectAndWait |
- name=submit_mult |
- label=Drop |
-
-
- clickAndWait |
- id=buttonYes |
- |
-
comment |
diff --git a/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html b/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html
index 50ef13b0..483bad92 100644
--- a/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html
+++ b/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html
@@ -31,7 +31,7 @@
comment |
-
+
|
@@ -86,7 +86,7 @@
comment |
-
+
|
@@ -94,24 +94,29 @@
link=Index |
|
-
- clickAndWait |
- link=Faculty Member |
- |
-
assertTitle |
- Faculty Member |
+ Index of Contents |
|
clickAndWait |
- link=Faculty, Jane |
+ link=Academic Department |
|
assertTitle |
- Faculty, Jane |
+ Academic Department |
+ |
+
+
+ clickAndWait |
+ link=Department A |
+ |
+
+
+ assertTitle |
+ Department A |
|
@@ -120,13 +125,13 @@
|
- comment |
-
+ assertTitle |
+ Individual Control Panel |
|
clickAndWait |
- //input[@value="Edit This Individual"] |
+ //input[@value='Edit This Individual'] |
|
@@ -135,8 +140,8 @@
|
- clickAndWait |
- _delete |
+ click |
+ name=_delete |
|
@@ -145,8 +150,133 @@
|
- waitForPageToLoad |
- 10000 |
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
+
+ clickAndWait |
+ link=Academic Department |
+ |
+
+
+ assertTitle |
+ Academic Department |
+ |
+
+
+ clickAndWait |
+ link=Department B |
+ |
+
+
+ assertTitle |
+ Department B |
+ |
+
+
+ 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. |
+ |
+
+
+ assertTitle |
+ VIVO Site Administration |
+ |
+
+
+ clickAndWait |
+ link=Index |
+ |
+
+
+ assertTitle |
+ Index of Contents |
+ |
+
+
+ clickAndWait |
+ link=Building |
+ |
+
+
+ assertTitle |
+ Building |
+ |
+
+
+ clickAndWait |
+ link=Building A |
+ |
+
+
+ assertTitle |
+ Building A |
+ |
+
+
+ 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. |
|
@@ -156,7 +286,7 @@
comment |
-
+
|
@@ -216,7 +346,12 @@
verifyTextNotPresent |
- Faculty Member |
+ Academic Department |
+ |
+
+
+ verifyTextNotPresent |
+ Building |
|