diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
index ce773530..32c14cab 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
@@ -86,9 +86,14 @@
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[6] |
+ |
+
clickAndWait |
- //h3[@id='hasCo-PrincipalInvestigatorRole']/a/img |
+ xpath=(//img[@alt='add'])[18] |
|
@@ -134,7 +139,12 @@
clickAndWait |
- //h3[@id='hasCo-PrincipalInvestigatorRole']/a/img |
+ xpath=(//img[@alt='add'])[18] |
+ |
+
+
+ assertTitle |
+ Edit |
|
@@ -227,7 +237,7 @@
clickAndWait |
- //h3[@id='hasCo-PrincipalInvestigatorRole']/a/img |
+ xpath=(//img[@alt='add'])[18] |
|
@@ -335,7 +345,7 @@
clickAndWait |
- //h3[@id='hasInvestigatorRole']/a/img |
+ xpath=(//img[@alt='add'])[19] |
|
@@ -381,7 +391,7 @@
clickAndWait |
- //h3[@id='hasInvestigatorRole']/a/img |
+ xpath=(//img[@alt='add'])[19] |
|
@@ -479,7 +489,7 @@
clickAndWait |
- //h3[@id='hasPrincipalInvestigatorRole']/a/img |
+ css=#researchGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
index 0e99b466..d8db41c4 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
@@ -93,7 +93,12 @@
clickAndWait |
- //h3[@id='hasResearcherRole']/a/img |
+ css=#RO_0000053-ResearcherRole > a.add-RO_0000053 > img.add-individual |
+ |
+
+
+ assertTitle |
+ Edit |
|
@@ -119,7 +124,7 @@
clickAndWait |
- //h3[@id='hasResearcherRole']/a/img |
+ css=#RO_0000053-ResearcherRole > a.add-RO_0000053 > img.add-individual |
|
@@ -154,17 +159,17 @@
verifyTextPresent |
- Project Name |
+ Research Activity Name |
|
verifyTextPresent |
- Role in Project |
+ Role in Research Activity |
|
verifyTextPresent |
- Years of Participation in Project |
+ Years of Participation |
|
@@ -183,6 +188,16 @@
|
+
+ clickAndWait |
+ css=#RO_0000053-ResearcherRole > a.add-RO_0000053 > img.add-individual |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
verifyTextPresent |
Create research activity entry for Faculty, Jane |
@@ -198,11 +213,6 @@
typeSelector |
label=Project |
-
- verifyTextPresent |
- Create research activity entry for Faculty, Jane |
- |
-
verifyTextPresent |
Research Activity Type |
@@ -210,17 +220,17 @@
verifyTextPresent |
- Project Name |
+ Research Activity Name |
|
verifyTextPresent |
- Role in Project |
+ Role in Research Activity |
|
verifyTextPresent |
- Years of Participation in Project |
+ Years of Participation |
|
@@ -287,7 +297,7 @@
clickAndWait |
- //h3[@id='hasResearcherRole']/a/img |
+ css=#RO_0000053-ResearcherRole > a.add-RO_0000053 > img.add-individual |
|
@@ -322,17 +332,17 @@
verifyTextPresent |
- Grant Name |
+ Research Activity Name |
|
verifyTextPresent |
- Role in Grant |
+ Role in Research Activity |
|
verifyTextPresent |
- Years of Participation in Grant |
+ Years of Participation |
|
@@ -402,9 +412,14 @@
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[8] |
+ |
+
clickAndWait |
- //h3[@id='hasTeacherRole']/a/img |
+ css=#teachingGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -429,17 +444,17 @@
verifyTextPresent |
- Conference Name |
+ Teaching Activity Name |
|
verifyTextPresent |
- Role in Conference |
+ Role in Teaching Activity |
|
verifyTextPresent |
- Years of Participation in Conference |
+ Years of Participation |
|
@@ -511,7 +526,7 @@
clickAndWait |
- //h3[@id='hasTeacherRole']/a/img |
+ css=#teachingGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -536,17 +551,17 @@
verifyTextPresent |
- Course Name |
+ Teaching Activity Name |
|
verifyTextPresent |
- Role in Course |
+ Role in Teaching Activity |
|
verifyTextPresent |
- Years of Participation in Course |
+ Years of Participation |
|
@@ -618,7 +633,7 @@
clickAndWait |
- //h3[@id='hasTeacherRole']/a/img |
+ css=#teachingGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -643,17 +658,17 @@
verifyTextPresent |
- Workshop Name |
+ Teaching Activity Name |
|
verifyTextPresent |
- Role in Workshop |
+ Role in Teaching Activity |
|
verifyTextPresent |
- Years of Participation in Workshop |
+ Years of Participation |
|
@@ -723,9 +738,14 @@
|
+
+ click |
+ css=li.nonSelectedGroupTab.clickable |
+ |
+
clickAndWait |
- //h3[@id='hasClinicalRole']/a/img |
+ xpath=(//img[@alt='add'])[10] |
|
@@ -760,17 +780,17 @@
verifyTextPresent |
- Project Name |
+ Clinical Activity Name |
|
verifyTextPresent |
- Role in Project |
+ Role in Clinical Activity |
|
verifyTextPresent |
- Years of Participation in Project |
+ Years of Participation |
|
@@ -842,7 +862,7 @@
clickAndWait |
- //h3[@id='hasClinicalRole']/a/img |
+ xpath=(//img[@alt='add'])[10] |
|
@@ -877,17 +897,17 @@
verifyTextPresent |
- Service Name |
+ Clinical Activity Name |
|
verifyTextPresent |
- Role in Service |
+ Role in Clinical Activity |
|
verifyTextPresent |
- Years of Participation in Service |
+ Years of Participation |
|
@@ -957,6 +977,11 @@
|
+
+ click |
+ css=li.nonSelectedGroupTab.clickable |
+ |
+
verifyElementPresent |
link=Prototype New Ape Home |
@@ -977,6 +1002,11 @@
Ape Health Program Founder 1993 - |
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[6] |
+ |
+
verifyElementPresent |
link=History of Apes in Africa |
@@ -997,6 +1027,11 @@
Habitats for Apes Researcher 1980 - 1985 |
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[8] |
+ |
+
verifyElementPresent |
link=Working with Primates |
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
index f2753d57..390ac821 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
@@ -91,9 +91,14 @@
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[18] |
+ |
+
clickAndWait |
- css=a.add-hasAttendeeRole > img.add-individual |
+ css=#otherGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -124,7 +129,7 @@
clickAndWait |
- css=a.add-hasAttendeeRole |
+ css=#otherGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -153,6 +158,11 @@
|
+
+ clickAndWait |
+ css=#otherGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
+ |
+
assertTitle |
Edit |
@@ -175,12 +185,12 @@
verifyTextPresent |
- Conference Name |
+ Event Name |
|
verifyTextPresent |
- Years of Participation in Conference |
+ Years of Participation |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
index e3c811ea..d83af41f 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
@@ -86,9 +86,14 @@
|
+
+ click |
+ css=li.nonSelectedGroupTab.clickable |
+ |
+
clickAndWait |
- //h3[@id='hasPresenterRole']/a/img |
+ css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -119,7 +124,7 @@
clickAndWait |
- //h3[@id='hasPresenterRole']/a/img |
+ css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -154,7 +159,17 @@
verifyTextPresent |
- Years of Participation in Presentation |
+ Years of Participation |
+ |
+
+
+ verifyTextPresent |
+ Start Year |
+ |
+
+
+ verifyTextPresent |
+ End Year |
|
@@ -163,6 +178,16 @@
|
+
+ clickAndWait |
+ css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
+ |
+
+
+ assertTitle |
+ Edit |
+ |
+
verifyTextPresent |
Create presentation entry for Librarian, Lily |
@@ -190,7 +215,17 @@
verifyTextPresent |
- Years of Participation in Presentation |
+ Years of Participation |
+ |
+
+
+ verifyTextPresent |
+ Start Year |
+ |
+
+
+ verifyTextPresent |
+ End Year |
|
@@ -241,7 +276,17 @@
verifyTextPresent |
- Years of Participation in Presentation |
+ Years of Participation |
+ |
+
+
+ verifyTextPresent |
+ Start Year |
+ |
+
+
+ verifyTextPresent |
+ End Year |
|
@@ -287,7 +332,22 @@
verifyTextPresent |
- Year |
+ Presented At |
+ |
+
+
+ verifyTextPresent |
+ Years of Participation |
+ |
+
+
+ verifyTextPresent |
+ Start Year |
+ |
+
+
+ verifyTextPresent |
+ End Year |
|
@@ -344,7 +404,7 @@
clickAndWait |
- //h3[@id='hasPresenterRole']/a/img |
+ css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -379,17 +439,32 @@
verifyTextPresent |
- Invited Talk Name |
+ Presentation Name |
|
verifyTextPresent |
- Role in Invited Talk |
+ Role in Presentation |
|
verifyTextPresent |
- Years of Participation in Invited Talk |
+ Presented At |
+ |
+
+
+ verifyTextPresent |
+ Years of Participation |
+ |
+
+
+ verifyTextPresent |
+ Start Year |
+ |
+
+
+ verifyTextPresent |
+ End Year |
|
@@ -465,9 +540,14 @@
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[10] |
+ |
+
clickAndWait |
- //h3[@id='hasServiceProviderRole']/a/img |
+ css=#serviceGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -492,17 +572,17 @@
verifyTextPresent |
- College Name |
+ Organization Name |
|
verifyTextPresent |
- Role in College |
+ Role in Organization |
|
verifyTextPresent |
- Years of Participation in College |
+ Years of Participation |
|
@@ -572,9 +652,14 @@
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[10] |
+ |
+
clickAndWait |
- //h3[@id='hasServiceProviderRole']/a/img |
+ css=#serviceGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual |
|
@@ -599,17 +684,17 @@
verifyTextPresent |
- Museum Name |
+ Organization Name |
|
verifyTextPresent |
- Role in Museum |
+ Role in Organization |
|
verifyTextPresent |
- Years of Participation in Museum |
+ Years of Participation |
|
@@ -679,6 +764,11 @@
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[10] |
+ |
+
verifyElementPresent |
link=Primates of the World |
@@ -700,9 +790,14 @@
|
+
+ click |
+ //div[@id='wrapper-content']/ul/li[10] |
+ |
+
clickAndWait |
- //h3[@id='hasOutreachProviderRole']/a/img |
+ xpath=(//img[@alt='add'])[29] |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
index 71b30a89..a21808f0 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
@@ -86,9 +86,14 @@
|
+
+ click |
+ css=li.nonSelectedGroupTab.clickable |
+ |
+
clickAndWait |
- //h3[@id='hasLeaderRole']/a/img |
+ css=a.add-RO_0000053 > img.add-individual |
|
@@ -113,17 +118,17 @@
verifyTextPresent |
- Department Name |
+ Organization Name |
|
verifyTextPresent |
- Role in Department |
+ Role in Organization |
|
verifyTextPresent |
- Years of Participation in Department |
+ Years of Participation |
|
@@ -195,7 +200,7 @@
clickAndWait |
- //h3[@id='hasMemberRole']/a/img |
+ xpath=(//img[@alt='add'])[8] |
|
@@ -220,17 +225,17 @@
verifyTextPresent |
- Association Name |
+ Organization Name |
|
verifyTextPresent |
- Role in Association |
+ Role in Organization |
|
verifyTextPresent |
- Years of Participation in Association |
+ Years of Participation |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html
index ba5b485b..e136fbad 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html
@@ -118,13 +118,13 @@
- assertTitle |
- Faculty, Jane |
+ selectWindow |
+ null |
|
clickAndWait |
- css=a.add-preferredTitle > img.add-individual |
+ css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual |
|
@@ -132,19 +132,14 @@
Edit |
|
-
- waitForElementPresent |
- tinymce |
- |
-
type |
- tinymce |
+ id=preferredTitle |
Assistant Professor |
clickAndWait |
- submit |
+ id=submit |
|
diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html b/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html
index fb9615e1..31bd287a 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html
@@ -113,7 +113,7 @@
clickAndWait |
- css=a.add-preferredTitle > img.add-individual |
+ css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual |
|
@@ -121,19 +121,14 @@
Edit |
|
-
- waitForElementPresent |
- tinymce |
- |
-
type |
- tinymce |
+ id=preferredTitle |
Associate Librarian |
clickAndWait |
- submit |
+ id=submit |
|