diff --git a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html index 9e5b007b..28c3d8a2 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html @@ -98,9 +98,14 @@ + + click + css=li.nonSelectedGroupTab.clickable + + clickAndWait - //h3[@id='authorInAuthorship']/a/img + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -174,11 +179,6 @@ Furter, Frank - - verifyElementPresent - link=Too Much Nintendo - - verifyTextPresent academic article @@ -186,7 +186,12 @@ verifyTextPresent - Too Much Nintendo + Too Much Nintendo.  Child Development.  29:298-344. 2010 + + + + verifyElementPresent + link=Too Much Nintendo @@ -338,7 +343,7 @@ clickAndWait - link=exact:Can't find the concept you want? Create your own. + link=Can't find the concept you want? Create your own. @@ -523,11 +528,6 @@ 10000 - - verifyElementPresent - link=Faculty Member - - verifyTextPresent Faculty Member (1) @@ -535,7 +535,7 @@ verifyElementPresent - link=Person + link=Faculty Member @@ -545,7 +545,7 @@ verifyElementPresent - link=Organization + link=Person @@ -555,7 +555,7 @@ verifyElementPresent - link=Publisher + link=Organization @@ -565,7 +565,12 @@ verifyElementPresent - link=Academic Article + link=Publisher + + + + verifyTextPresent + research @@ -575,7 +580,7 @@ verifyElementPresent - link=Article + link=Academic Article @@ -583,6 +588,16 @@ Article (1) + + verifyElementPresent + link=Article + + + + verifyTextPresent + Book (1) + + verifyElementPresent link=Book @@ -590,7 +605,7 @@ verifyTextPresent - Book (2) + Concept (1) @@ -598,11 +613,6 @@ link=Concept - - verifyTextPresent - Concept (1) - - clickAndWait @@ -630,13 +640,13 @@ - verifyElementPresent - link=Too Much Nintendo + verifyTextPresent + Too Much Nintendo.  Child Development.  29:298-344. 2010 - verifyTextPresent - Too Much Nintendo.  Child Development.  29:298-344. 2010 + verifyElementPresent + link=Too Much Nintendo @@ -651,8 +661,8 @@ - verifyTextPresent - Supplement + click + //div[@id='wrapper-content']/ul/li[16] @@ -661,8 +671,8 @@ - verifyTextPresent - 29 + verifyElementPresent + link=Child Development @@ -680,16 +690,6 @@ 2010 - - verifyTextPresent - 987654321.1234567890 - - - - verifyTextPresent - ABC111222333 - - verifyTextPresent DEF12121212 @@ -706,13 +706,23 @@ - verifyElementPresent - link=Child Development + verifyTextPresent + 987654321.1234567890 verifyTextPresent - Child Development + ABC111222333 + + + + verifyTextPresent + 29 + + + + verifyTextPresent + Supplement diff --git a/utilities/acceptance-tests/suites/AddPublications/AddBook.html b/utilities/acceptance-tests/suites/AddPublications/AddBook.html index 6b26eebc..e554c6b0 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddBook.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddBook.html @@ -93,9 +93,14 @@ + + click + css=li.nonSelectedGroupTab.clickable + + clickAndWait - //h3[@id='authorInAuthorship']/a/img + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -223,7 +228,7 @@ clickAndWait - link=exact:Can't find the concept you want? Create your own. + link=Can't find the concept you want? Create your own. @@ -253,7 +258,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -283,7 +288,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -313,7 +318,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -343,7 +348,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -373,7 +378,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -403,7 +408,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -465,7 +470,7 @@ verifyTextPresent - research + Faculty Member (1) @@ -475,7 +480,7 @@ verifyTextPresent - Faculty Member (1) + Person (1) @@ -485,7 +490,7 @@ verifyTextPresent - Person (1) + Organization (1) @@ -495,7 +500,7 @@ verifyTextPresent - Organization (1) + Publisher (1) @@ -505,7 +510,12 @@ verifyTextPresent - Publisher (1) + research + + + + verifyTextPresent + Book (1) @@ -515,7 +525,7 @@ verifyTextPresent - Book (2) + Concept (1) @@ -523,11 +533,6 @@ link=Concept - - verifyTextPresent - Concept (1) - - clickAndWait @@ -549,11 +554,6 @@ Furter, Frank - - verifyElementPresent - link=Nintendo: Good or Bad for Kids? - - verifyTextPresent book @@ -564,15 +564,25 @@ Nintendo: Good or Bad for Kids?.  New York: Putnam. 2010 + + verifyElementPresent + link=Nintendo: Good or Bad for Kids? + + clickAndWait - link=exact:Nintendo: Good or Bad for Kids? + link=Nintendo: Good or Bad for Kids? assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? + + + + click + //div[@id='wrapper-content']/ul/li[16] @@ -580,36 +590,6 @@ link=Furter, Frank - - verifyTextPresent - Putnam - - - - verifyTextPresent - New York - - - - verifyElementPresent - link=in press - - - - verifyTextPresent - in press - - - - verifyTextPresent - 2010 - - - - verifyTextPresent - 258 - - verifyElementPresent link=Child Development @@ -617,7 +597,7 @@ verifyTextPresent - Child Development + 2010 @@ -630,6 +610,26 @@ 7777777777777 + + verifyTextPresent + 258 + + + + verifyElementPresent + link=Putnam + + + + verifyTextPresent + New York + + + + verifyElementPresent + link=in press + + verifyTextPresent Children diff --git a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html index 7d7e0bd8..7c6d9878 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html @@ -95,7 +95,7 @@ clickAndWait - //h3[@id='authorInAuthorship']/a/img + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -180,13 +180,13 @@ - verifyElementPresent - link=Nintendo O.K. for Kids + verifyTextPresent + Nintendo O.K. for Kids.  Kids in the 21st Century. Ed. Sony, Sunny.  New York: Marcel Dekker. 765-876. - verifyTextPresent - Nintendo O.K. for Kids.  Kids in the 21st Century. Ed. Sony, Sunny.  New York: Marcel Dekker. 765-876. + verifyElementPresent + link=Nintendo O.K. for Kids @@ -248,7 +248,7 @@ clickAndWait - link=exact:Can't find the concept you want? Create your own. + link=Can't find the concept you want? Create your own. @@ -398,6 +398,11 @@ 10000 + + verifyTextPresent + Faculty Member (1) + + verifyElementPresent link=Faculty Member @@ -405,7 +410,7 @@ verifyTextPresent - Faculty Member (1) + Person (2) @@ -413,16 +418,6 @@ link=Person - - verifyTextPresent - Person (2) - - - - verifyTextPresent - Person (2) - - verifyTextPresent Organization (2) @@ -430,7 +425,7 @@ verifyElementPresent - link=Publisher + link=Organization @@ -440,17 +435,12 @@ verifyElementPresent - link=Chapter + link=Publisher verifyTextPresent - Chapter (1) - - - - verifyElementPresent - link=Academic Article + research @@ -460,7 +450,7 @@ verifyElementPresent - link=Article + link=Academic Article @@ -468,6 +458,16 @@ Article (1) + + verifyElementPresent + link=Article + + + + verifyTextPresent + Book (2) + + verifyElementPresent link=Book @@ -475,12 +475,12 @@ verifyTextPresent - Book (3) + Chapter (1) verifyElementPresent - link=Concept + link=Chapter @@ -488,6 +488,11 @@ Concept (1) + + verifyElementPresent + link=Concept + + clickAndWait @@ -515,13 +520,13 @@ - verifyElementPresent - link=Nintendo O.K. for Kids + verifyTextPresent + Nintendo O.K. for Kids.  Kids in the 21st Century. Ed. Sony, Sunny.  New York: Marcel Dekker. 765-876. - verifyTextPresent - Nintendo O.K. for Kids.  Kids in the 21st Century. Ed. Sony, Sunny.  New York: Marcel Dekker. 765-876. + verifyElementPresent + link=Nintendo O.K. for Kids diff --git a/utilities/acceptance-tests/suites/AddPublications/AddConference.html b/utilities/acceptance-tests/suites/AddPublications/AddConference.html index eb592e7b..ca9ac4c2 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddConference.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddConference.html @@ -100,7 +100,7 @@ clickAndWait - //h3[@id='authorInAuthorship']/a/img + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -160,13 +160,13 @@ - verifyElementPresent - link=Nintendo Case Studies + verifyTextPresent + Nintendo Case Studies.  Games and Child Development. 2010 - verifyTextPresent - Nintendo Case Studies 2010 + verifyElementPresent + link=Nintendo Case Studies @@ -198,7 +198,7 @@ clickAndWait - link=exact:Can't find the concept you want? Create your own. + link=Can't find the concept you want? Create your own. @@ -353,11 +353,6 @@ 10000 - - verifyElementPresent - link=Faculty Member - - verifyTextPresent Faculty Member (1) @@ -365,7 +360,7 @@ verifyElementPresent - link=Person + link=Faculty Member @@ -375,7 +370,7 @@ verifyElementPresent - link=Conference + link=Person @@ -385,7 +380,7 @@ verifyElementPresent - link=Event + link=Conference @@ -395,7 +390,7 @@ verifyElementPresent - link=Organization + link=Event @@ -405,7 +400,7 @@ verifyElementPresent - link=Publisher + link=Organization @@ -415,17 +410,12 @@ verifyElementPresent - link=Chapter + link=Publisher verifyTextPresent - Chapter (1) - - - - verifyElementPresent - link=Academic Article + research @@ -435,7 +425,7 @@ verifyElementPresent - link=Article + link=Academic Article @@ -443,6 +433,16 @@ Article (2) + + verifyElementPresent + link=Article + + + + verifyTextPresent + Book (2) + + verifyElementPresent link=Book @@ -450,12 +450,12 @@ verifyTextPresent - Book (3) + Chapter (1) verifyElementPresent - link=Concept + link=Chapter @@ -465,7 +465,7 @@ verifyElementPresent - link=Conference Paper + link=Concept @@ -473,6 +473,11 @@ Conference Paper (1) + + verifyElementPresent + link=Conference Paper + + clickAndWait @@ -500,13 +505,13 @@ - verifyElementPresent - link=Nintendo Case Studies + verifyTextPresent + Nintendo Case Studies.  Games and Child Development. 2010 - verifyTextPresent - Nintendo Case Studies 2010 + verifyElementPresent + link=Nintendo Case Studies diff --git a/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html b/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html index 2c1f4e34..6e195fa0 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html @@ -109,7 +109,7 @@ clickAndWait - css=a.add-preferredTitle > img.add-individual + css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual @@ -117,14 +117,9 @@ Edit - - waitForElementPresent - tinymce - - type - tinymce + id=preferredTitle Associate Professor diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html b/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html index 2ceb924e..a81773a1 100644 --- a/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html @@ -45,6 +45,11 @@ people + + verifyTextPresent + Faculty Member (1) + + verifyElementPresent link=Faculty Member @@ -52,7 +57,7 @@ verifyTextPresent - Faculty Member (1) + Person (2) @@ -60,21 +65,11 @@ link=Person - - verifyTextPresent - Person (2) - - verifyTextPresent events - - verifyElementPresent - link=Conference - - verifyTextPresent Conference (1) @@ -82,7 +77,7 @@ verifyElementPresent - link=Event + link=Conference @@ -91,13 +86,13 @@ - verifyTextPresent - organizations + verifyElementPresent + link=Event - verifyElementPresent - link=Organization + verifyTextPresent + organizations @@ -107,7 +102,7 @@ verifyElementPresent - link=Publisher + link=Organization @@ -116,13 +111,13 @@ - verifyTextPresent - research + verifyElementPresent + link=Publisher - verifyElementPresent - link=Academic Article + verifyTextPresent + research @@ -132,7 +127,7 @@ verifyElementPresent - link=Article + link=Academic Article @@ -142,17 +137,17 @@ verifyElementPresent - link=Book + link=Article verifyTextPresent - Book (3) + Book (2) verifyElementPresent - link=Chapter + link=Book @@ -162,7 +157,7 @@ verifyElementPresent - link=Concept + link=Chapter @@ -172,7 +167,7 @@ verifyElementPresent - link=Conference Paper + link=Concept @@ -180,6 +175,11 @@ Conference Paper (1) + + verifyElementPresent + link=Conference Paper + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html index 271dfbe1..7ceaad18 100644 --- a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html @@ -112,8 +112,8 @@ - verifyElementPresent - link=Nintendo Case Studies + verifyTextPresent + Nintendo Case Studies.  Games and Child Development. 2010 @@ -127,6 +127,11 @@ link=Nintendo O.K. for Kids + + click + //div[@id='wrapper-content']/ul/li[8] + + assertTitle Nintendo O.K. for Kids @@ -142,11 +147,6 @@ link=Sony, Sunny - - verifyTextPresent - Sony, Sunny Person - - verifyTextPresent 765 @@ -167,11 +167,6 @@ link=Marcel Dekker - - verifyTextPresent - Marcel Dekker - - verifyTextPresent New York @@ -218,6 +213,11 @@ Nintendo Case Studies + + click + //div[@id='wrapper-content']/ul/li[8] + + verifyElementPresent link=Furter, Frank @@ -228,11 +228,6 @@ link=Games and Child Development - - verifyTextPresent - Games and Child Development - - verifyTextPresent 2010 @@ -243,11 +238,6 @@ link=Child Development - - verifyTextPresent - Child Development - - verifyTextPresent Games @@ -271,12 +261,17 @@ clickAndWait - link=exact:Nintendo: Good or Bad for Kids? + link=Nintendo: Good or Bad for Kids? assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? + + + + click + //div[@id='wrapper-content']/ul/li[12] @@ -289,11 +284,6 @@ link=Putnam - - verifyTextPresent - Putnam - - verifyTextPresent New York @@ -304,11 +294,6 @@ link=in press - - verifyTextPresent - in press - - verifyTextPresent 2010 @@ -324,11 +309,6 @@ link=Child Development - - verifyTextPresent - Child Development - - verifyTextPresent 5555555555 @@ -365,6 +345,11 @@ link=Too Much Nintendo + + click + //div[@id='wrapper-content']/ul/li[12] + + assertTitle Too Much Nintendo @@ -430,11 +415,6 @@ link=Child Development - - verifyTextPresent - Child Development - - verifyTextPresent Children diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html b/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html index 8fc73d35..95e3560f 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html @@ -197,77 +197,6 @@ 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 diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html index e55d3390..cd684da3 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html @@ -68,7 +68,7 @@ verifyTextPresent - research + people @@ -81,6 +81,11 @@ organizations + + verifyTextPresent + research + + clickAndWait @@ -212,11 +217,6 @@ link=Index - - clickAndWait - link=Index - - clickAndWait link=Organization @@ -403,11 +403,6 @@ 10000 - - verifyTextNotPresent - topics - - verifyTextNotPresent events @@ -418,6 +413,11 @@ organizations + + verifyTextNotPresent + research + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html b/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html index 8a9f3a86..d25325e5 100644 --- a/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html +++ b/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html @@ -87,6 +87,11 @@ + + click + css=li.nonSelectedGroupTab.clickable + + verifyTextPresent Too Much Nintendo.  Child Development.  29:298-344. 2010 @@ -104,18 +109,13 @@ verifyTextPresent - Nintendo Case Studies 2010 + Nintendo Case Studies.  Games and Child Development. 2010 - - verifyTextPresent - manage publications - - clickAndWait - id=managePropLink + id=managePubLink @@ -123,6 +123,11 @@ VIVO + + verifyTextPresent + Manage Publications for Frank Furter + + click css=input.pubCheckbox @@ -145,7 +150,7 @@ clickAndWait - link=Return to profile page + link=Return to Profile Page @@ -171,7 +176,7 @@ verifyTextNotPresent - Nintendo Case Studies 2010 + Nintendo Case Studies.  Games and Child Development. 2010 @@ -182,7 +187,7 @@ clickAndWait - id=managePropLink + id=managePubLink @@ -222,7 +227,7 @@ clickAndWait - link=Return to profile page + link=Return to Profile Page @@ -248,7 +253,7 @@ verifyTextPresent - Nintendo Case Studies 2010 + Nintendo Case Studies.  Games and Child Development. 2010 @@ -259,7 +264,7 @@ clickAndWait - id=managePropLink + id=managePubLink @@ -279,7 +284,7 @@ clickAndWait - link=Return to profile page + link=Return to Profile Page @@ -305,7 +310,7 @@ verifyTextPresent - Nintendo Case Studies 2010 + Nintendo Case Studies.  Games and Child Development. 2010 diff --git a/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html b/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html index a07b3915..1c657d6b 100644 --- a/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html +++ b/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html @@ -69,6 +69,11 @@ link=research + + verifyTextPresent + Too Much Nintendo Academic Article + + verifyElementPresent link=Too Much Nintendo @@ -76,7 +81,7 @@ verifyTextPresent - Too Much Nintendo + Nintendo Case Studies Conference Paper @@ -86,7 +91,7 @@ verifyTextPresent - Nintendo Case Studies + Nintendo O.K. for Kids Chapter @@ -96,7 +101,7 @@ verifyTextPresent - Nintendo O.K. for Kids + Nintendo: Good or Bad for Kids? Book @@ -106,17 +111,17 @@ verifyTextPresent - Nintendo: Good or Bad for Kids? + Child Development Concept verifyElementPresent - link=Furter, Frank + link=Child Development verifyTextPresent - Furter, Frank + Games and Child Development Conference @@ -126,7 +131,7 @@ verifyTextPresent - Games and Child Development + Putnam Publisher @@ -136,7 +141,17 @@ verifyTextPresent - Putnam + Child Development + + + + verifyElementPresent + link=Child Development + + + + verifyTextPresent + Marcel Dekker Publisher @@ -146,17 +161,22 @@ verifyTextPresent - Marcel Dekker + Kids in the 21st Century Book verifyElementPresent - link=Sony, Sunny + link=Kids in the 21st Century verifyTextPresent - Sony, Sunny Person + Furter, Frank Associate Professor + + + + verifyElementPresent + link=Furter, Frank @@ -185,14 +205,9 @@ link=research - - verifyElementPresent - link=Games and Child Development - - verifyTextPresent - Games and Child Development + Child Development @@ -202,7 +217,17 @@ verifyTextPresent - Child Development + Child Development Concept + + + + verifyElementPresent + link=Child Development + + + + verifyTextPresent + Nintendo Case Studies Conference Paper @@ -212,7 +237,17 @@ verifyTextPresent - Nintendo Case Studies + Games and Child Development Conference + + + + verifyElementPresent + link=Games and Child Development + + + + verifyTextPresent + Too Much Nintendo Academic Article @@ -222,17 +257,17 @@ verifyTextPresent - Too Much Nintendo + Nintendo: Good or Bad for Kids? Book verifyElementPresent - link=exact:Nintendo: Good or Bad for Kids? + link=Nintendo: Good or Bad for Kids? verifyTextPresent - Nintendo: Good or Bad for Kids? + Nintendo O.K. for Kids Chapter @@ -240,11 +275,6 @@ link=Nintendo O.K. for Kids - - verifyTextPresent - Nintendo O.K. for Kids - - type @@ -266,24 +296,9 @@ link=research - - verifyElementPresent - link=Too Much Nintendo - - verifyTextPresent - Too Much Nintendo - - - - verifyElementPresent - link=Nintendo Case Studies - - - - verifyTextPresent - Nintendo Case Studies + Nintendo: Good or Bad for Kids? Book @@ -293,7 +308,17 @@ verifyTextPresent - Nintendo: Good or Bad for Kids? + Nintendo Case Studies Conference Paper + + + + verifyElementPresent + link=Nintendo Case Studies + + + + verifyTextPresent + Nintendo O.K. for Kids Chapter @@ -303,7 +328,12 @@ verifyTextPresent - Nintendo O.K. for Kids + Too Much Nintendo Academic Article + + + + verifyElementPresent + link=Too Much Nintendo @@ -332,6 +362,11 @@ link=research + + verifyTextPresent + Games and Child Development Conference + + verifyElementPresent link=Games and Child Development @@ -339,17 +374,7 @@ verifyTextPresent - Games and Child Development - - - - verifyElementPresent - link=Too Much Nintendo - - - - verifyTextPresent - Too Much Nintendo + Nintendo Case Studies Conference Paper @@ -359,7 +384,7 @@ verifyTextPresent - Nintendo Case Studies + Nintendo: Good or Bad for Kids? Book @@ -369,7 +394,7 @@ verifyTextPresent - Nintendo: Good or Bad for Kids? + Nintendo O.K. for Kids Chapter @@ -379,7 +404,12 @@ verifyTextPresent - Nintendo O.K. for Kids + Too Much Nintendo Academic Article + + + + verifyElementPresent + link=Too Much Nintendo @@ -405,7 +435,7 @@ verifyElementPresent - link=Games and Child Development + link=research @@ -413,6 +443,21 @@ Games and Child Development Conference + + verifyElementPresent + link=Games and Child Development + + + + verifyTextPresent + Nintendo Case Studies Conference Paper + + + + verifyElementPresent + link=Nintendo Case Studies + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index 87b2fa9e..c52eadf7 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -177,6 +177,11 @@ + + selectWindow + null + + clickAndWait css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html index 2a568d3e..9054ec7c 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html @@ -85,14 +85,24 @@ Asserted Class Hierarchy + + selectAndWait + id=displayOption + label=All Classes + + + assertTitle + VIVO + + verifyTextPresent - vivo:Librarian + Librarian (vivo) clickAndWait - link=exact:vivo:Librarian + link=Librarian (vivo) @@ -113,13 +123,13 @@ select - SuperclassURI - label=vivo:Faculty Member + name=SuperclassURI + label=Facility Member (vivo) select - SubclassURI - label=vivo:Librarian + name=SubclassURI + label=Librarian (vivo) clickAndWait @@ -132,6 +142,36 @@ + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Assistant Professor + + + + verifyElementPresent + link=Librarian, Lily Lou + + + + verifyTextPresent + Assistant Librarian + + clickAndWait link=People @@ -232,6 +272,11 @@ People + + verifyTextPresent + Faculty Member + + verifyElementPresent link=Faculty, Jane @@ -244,7 +289,7 @@ verifyElementPresent - link=Librarian, Lily + link=Librarian, Lily Lou @@ -252,6 +297,46 @@ Assistant Librarian + + click + link=Librarian (1) + + + + verifyElementPresent + link=Librarian, Lily Lou + + + + verifyTextPresent + Assistant Librarian + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + verifyTextPresent + Faculty Member (2) + + + + verifyTextPresent + Librarian (1) + + + + verifyTextPresent + Person (2) + + clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html index 8fcb6f0f..7b5b8a15 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html @@ -133,7 +133,7 @@ assertTitle - Crop Photo for Faculty, Jane + Crop image for Faculty, Jane @@ -194,7 +194,7 @@ assertTitle - Crop Photo for Faculty, Jane + Crop image for Faculty, Jane diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html index 382c7e2c..031bd013 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html @@ -77,12 +77,12 @@ clickAndWait - link=Librarian, Lily + link=Librarian, Lily Lou assertTitle - Librarian, Lily + Librarian, Lily Lou @@ -99,7 +99,7 @@ assertTitle - Replace image for Librarian, Lily + Replace image for Librarian, Lily Lou @@ -134,21 +134,26 @@ assertTitle - Librarian, Lily + Librarian, Lily Lou + + selectWindow + null + + clickAndWait - //img[@alt='edit'] + css=img.edit-individual + + + + assertTitle + Replace image for Librarian, Lily Lou - - assertTitle - Replace image for Librarian, Lily - - verifyTextPresent Photo Upload @@ -181,7 +186,7 @@ assertTitle - Crop Photo for Librarian, Lily + Crop image for Librarian, Lily Lou @@ -191,21 +196,21 @@ assertTitle - Librarian, Lily + Librarian, Lily Lou clickAndWait - //img[@alt='edit'] + css=img.edit-individual + + + + assertTitle + Replace image for Librarian, Lily Lou - - assertTitle - Replace image for Librarian, Lily - - verifyTextPresent Photo Upload @@ -238,7 +243,7 @@ assertTitle - Crop Photo for Librarian, Lily + Crop image for Librarian, Lily Lou @@ -248,7 +253,7 @@ assertTitle - Librarian, Lily + Librarian, Lily Lou @@ -260,7 +265,12 @@ clickAndWait - //img[@alt='edit'] + css=img.edit-individual + + + + assertTitle + Replace image for Librarian, Lily Lou @@ -276,7 +286,7 @@ assertTitle - Crop Photo for Librarian, Lily + Crop image for Librarian, Lily Lou @@ -286,7 +296,7 @@ assertTitle - Librarian, Lily + Librarian, Lily Lou @@ -298,7 +308,12 @@ clickAndWait - //img[@alt='edit'] + css=img.edit-individual + + + + assertTitle + Replace image for Librarian, Lily Lou @@ -314,7 +329,7 @@ assertTitle - Crop Photo for Librarian, Lily + Crop image for Librarian, Lily Lou @@ -324,7 +339,7 @@ assertTitle - Librarian, Lily + Librarian, Lily Lou diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 844e2c92..95b3fcb7 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -106,6 +106,11 @@ link=Remove + + assertTitle + Edit + + click id=showAddFormButton @@ -113,7 +118,7 @@ clickAndWait - link=exact:Can't find the concept you want? Create your own. + link=Create your own concept @@ -161,6 +166,11 @@ Are you sure you want to remove this web page? + + assertTitle + Edit + + clickAndWait id=showAddForm @@ -286,6 +296,11 @@ css=a.edit-geographicFocus > img.edit-individual + + assertTitle + Faculty, Jane + + assertTitle Edit @@ -321,56 +336,6 @@ Faculty, Jane - - clickAndWait - css=a.delete-geographicFocus > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.edit-advisorIn > img.edit-individual - - - - assertTitle - Edit - - - - click - xpath=(//a[contains(text(),'change selection)')])[2] - - - - type - id=SubjectArea - Primate Foundation of Africa - - - clickAndWait - css=input.submit - - - - assertTitle - Faculty, Jane - - clickAndWait css=a.edit-teachingOverview > img.edit-individual @@ -433,7 +398,7 @@ clickAndWait - css=a.edit-adviseeIn > img.edit-individual + css=#relatedBy-AwardReceipt-List > li > a.edit-relatedBy > img.edit-individual @@ -442,8 +407,8 @@ - clickAndWait - id=offerCreate + click + id=changeSelection @@ -453,38 +418,13 @@ type - name - Primates Unite - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=#relatedBy-AwardorHonorReceipt-List > li > a.edit-relatedBy > img.edit-individual - - - - assertTitle - Edit - - - - clickAndWait - css=a.edit-awardOrHonor > img.edit-individual - + id=award + Ape Trainer of the Decade type id=org - Ape Trainer of the Decade + Professional Ape Trainer Association clickAndWait @@ -608,9 +548,14 @@ type - id=streetAddress + id=streetAddressOne Jungle 1234 + + type + id=streetAddressTwo + Tree 99 + clickAndWait submit @@ -656,6 +601,16 @@ css=a.edit-researcherId > img.edit-individual + + assertTitle + VIVO + + + + clickAndWait + css=a.edit-researcherId > img.edit-individual + + assertTitle Edit @@ -698,12 +653,17 @@ assertTitle - Edit + VIVO clickAndWait - id=submit + css=a.edit-freetextKeyword > img.edit-individual + + + + assertTitle + Edit @@ -711,16 +671,6 @@ Faculty, Jane - - clickAndWait - //div[@id='wrapper-content']/section[10]/article/ul/li/a[1]/img - - - - assertTitle - Edit - - waitForElementPresent tinymce @@ -1058,6 +1008,11 @@ Jungle 1234 + + verifyTextPresent + Tree 99 + + verifyTextPresent Congo City diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html index cbf5fefa..d1bace41 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html @@ -324,7 +324,7 @@ assertTitle - Crop Photo for Faculty, Jane + Crop image for Faculty, Jane diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html index 472e2f15..a75558dd 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html @@ -82,12 +82,12 @@ clickAndWait - link=Librarian, Lily + link=Librarian, Lily Lou assertTitle - Librarian, Lily + Librarian, Lily Lou @@ -104,7 +104,7 @@ assertTitle - Upload image for Librarian, Lily + Upload image for Librarian, Lily Lou @@ -135,7 +135,7 @@ assertTitle - Librarian, Lily + Librarian, Lily Lou @@ -146,7 +146,7 @@ assertTitle - Upload image for Librarian, Lily + Upload image for Librarian, Lily Lou @@ -181,7 +181,7 @@ assertTitle - Librarian, Lily + Librarian, Lily Lou @@ -192,7 +192,7 @@ assertTitle - Upload image for Librarian, Lily + Upload image for Librarian, Lily Lou @@ -227,7 +227,7 @@ assertTitle - Crop Photo for Librarian, Lily + Crop image for Librarian, Lily Lou @@ -237,7 +237,7 @@ assertTitle - Librarian, Lily + Librarian, Lily Lou @@ -259,7 +259,7 @@ assertTitle - Upload image for Librarian, Lily + Upload image for Librarian, Lily Lou @@ -274,7 +274,7 @@ assertTitle - Upload image for Librarian, Lily + Upload image for Librarian, Lily Lou @@ -315,7 +315,7 @@ assertTitle - Upload image for Librarian, Lily + Upload image for Librarian, Lily Lou @@ -346,7 +346,7 @@ assertTitle - Upload image for Librarian, Lily + Upload image for Librarian, Lily Lou @@ -361,7 +361,7 @@ assertTitle - Crop Photo for Librarian, Lily + Crop image for Librarian, Lily Lou @@ -371,15 +371,10 @@ assertTitle - Librarian, Lily + Librarian, Lily Lou - - assertTitle - Librarian, Lily - - verifyAttribute //img[@title='click to view larger image']@src diff --git a/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html b/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html index 335dbd6b..7551f0dc 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html +++ b/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html @@ -40,12 +40,12 @@ clickAndWait - link=Librarian, Lily + link=Librarian, Lily Lou assertTitle - Librarian, Lily + Librarian, Lily Lou diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html b/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html index 4703a703..1a08e854 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html @@ -35,6 +35,11 @@ + + verifyTextPresent + people + + verifyTextPresent Faculty Member (1) @@ -85,6 +90,16 @@ link=Award or Honor + + verifyTextPresent + Concept (3) + + + + verifyElementPresent + link=Concept + + clickAndWait