diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html index 5b3a68d9..d5924791 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html @@ -225,7 +225,7 @@ verifyTextPresent - Select an existing Organization for Primate Elderly Care + If you don't find the appropriate entry on the selection list above: @@ -599,7 +599,7 @@ clickAndWait - link=Can't find the concept you want? Create your own. + link=Select or create a VIVO-defined concept. diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html index c079cf51..2b6d8696 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html @@ -205,7 +205,7 @@ verifyTextPresent - Select an existing Organization for Introduction to Primate Health + If you don't find the appropriate entry on the selection list above: @@ -230,7 +230,7 @@ verifyTextPresent - Select an existing Course for Introduction to Primate Health + If you don't find the appropriate entry on the selection list above: @@ -390,7 +390,7 @@ clickAndWait - link=exact:Can't find the concept you want? Create your own. + link=Select or create a VIVO-defined concept. @@ -511,7 +511,7 @@ verifyTextPresent - Select an existing Document for Introduction to Primate Health + If you don't find the appropriate entry on the selection list above: @@ -612,7 +612,7 @@ clickAndWait - xpath=(//img[@alt='add'])[16] + xpath=(//img[@alt='add'])[19] diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html index f003012e..5e50f8c5 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html @@ -175,7 +175,7 @@ verifyTextPresent - Select an existing Organization for Primate Feeder + If you don't find the appropriate entry on the selection list above: @@ -206,7 +206,7 @@ verifyTextPresent - Select an existing Facility for Primate Feeder + If you don't find the appropriate entry on the selection list above: diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html index 3e65716a..8bcbe27d 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html @@ -301,7 +301,7 @@ verifyTextPresent - Select an existing Geographic Region for Primate Health Conference + If you don't find the appropriate entry on the selection list above: @@ -352,7 +352,7 @@ verifyTextPresent - Select an existing Geographic Location for Primate Health Conference + If you don't find the appropriate entry on the selection list above: @@ -407,7 +407,7 @@ verifyTextPresent - Select an existing Facility for Primate Health Conference + If you don't find the appropriate entry on the selection list above: @@ -530,7 +530,7 @@ verifyTextPresent - Select an existing Event for Primate Health Conference + If you don't find the appropriate entry on the selection list above: @@ -565,7 +565,7 @@ clickAndWait - link=Can't find the concept you want? Create your own. + link=Select or create a VIVO-defined concept. diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html index 5a2e70de..2ed43e52 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html @@ -170,7 +170,7 @@ verifyTextPresent - Select an existing Room for Jane Memorial Building + If you don't find the appropriate entry on the selection list above: @@ -215,7 +215,7 @@ verifyTextPresent - Select an existing Geographic Location for Jane Memorial Building + If you don't find the appropriate entry on the selection list above: @@ -261,7 +261,7 @@ verifyTextPresent - Select an existing Material Entity for Jane Memorial Building + If you don't find the appropriate entry on the selection list above: diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html index eea51f4b..51589021 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html @@ -175,7 +175,7 @@ verifyTextPresent - Select an existing Concept for Primate Health + If you don't find the appropriate entry on the selection list above: @@ -206,7 +206,7 @@ verifyTextPresent - Select an existing Concept for Primate Health + If you don't find the appropriate entry on the selection list above: @@ -251,7 +251,7 @@ verifyTextPresent - Select an existing Concept for Primate Health + If you don't find the appropriate entry on the selection list above: diff --git a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html index 74c71da2..63df6c0b 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html @@ -348,7 +348,7 @@ clickAndWait - link=Can't find the concept you want? Create your own. + link=Select or create a VIVO-defined concept. diff --git a/utilities/acceptance-tests/suites/AddPublications/AddBook.html b/utilities/acceptance-tests/suites/AddPublications/AddBook.html index 2c893fe5..aef425c8 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddBook.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddBook.html @@ -228,7 +228,7 @@ clickAndWait - link=Can't find the concept you want? Create your own. + link=Select or create a VIVO-defined concept. diff --git a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html index 3be86f61..5f2acc67 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html @@ -248,7 +248,7 @@ clickAndWait - link=Can't find the concept you want? Create your own. + link=Select or create a VIVO-defined concept. diff --git a/utilities/acceptance-tests/suites/AddPublications/AddConference.html b/utilities/acceptance-tests/suites/AddPublications/AddConference.html index 6ce4159f..50ff0771 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddConference.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddConference.html @@ -198,7 +198,7 @@ clickAndWait - link=Can't find the concept you want? Create your own. + link=Select or create a VIVO-defined concept. diff --git a/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html b/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html index d25325e5..4b7fbb65 100644 --- a/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html +++ b/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html @@ -128,9 +128,14 @@ Manage Publications for Frank Furter + + selectWindow + null + + click - css=input.pubCheckbox + css=input.itemCheckbox @@ -222,7 +227,7 @@ click - css=input.pubCheckbox + css=input.itemCheckbox diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index 3cb0549a..f15d2dac 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -568,7 +568,7 @@ clickAndWait - id=showAddForm + id=showAddFormButton @@ -608,7 +608,7 @@ clickAndWait - id=showAddForm + id=showAddFormButton @@ -631,11 +631,6 @@ url: This field must not be empty. - - verifyTextPresent - urlType: This field must not be empty. - - select name=urlType @@ -910,7 +905,7 @@ verifyTextPresent - Select an existing Agent for Nintendo O.K. for Kids + If you don't find the appropriate entry on the selection list above: @@ -940,7 +935,7 @@ verifyTextPresent - Select an existing Agent for Nintendo O.K. for Kids + If you don't find the appropriate entry on the selection list above: @@ -1052,7 +1047,7 @@ verifyTextPresent - Select an existing Event for Nintendo O.K. for Kids + If you don't find the appropriate entry on the selection list above: @@ -1087,7 +1082,7 @@ verifyTextPresent - Select an existing Event for Nintendo O.K. for Kids + If you don't find the appropriate entry on the selection list above: @@ -1227,11 +1222,6 @@ Edit - - verifyTextPresent - Select an existing Document Part for Nintendo O.K. for Kids - - verifyTextPresent If you don't find the appropriate entry on the selection list above: @@ -1308,11 +1298,6 @@ Edit - - verifyTextPresent - 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,7 +1366,7 @@ verifyTextPresent - Select an existing Geographic Region for Nintendo O.K. for Kids + If you don't find the appropriate entry on the selection list above: @@ -1416,7 +1401,7 @@ verifyTextPresent - Select an existing Geographic Region for Nintendo O.K. for Kids + If you don't find the appropriate entry on the selection list above: @@ -1745,7 +1730,7 @@ clickAndWait - link=Create your own concept + link=Select or create a VIVO-defined concept. @@ -1912,7 +1897,7 @@ verifyTextPresent - Select an existing Document for Nintendo O.K. for Kids + If you don't find the appropriate entry on the selection list above: @@ -1961,11 +1946,6 @@ Edit - - verifyTextPresent - Select an existing Document for Nintendo O.K. for Kids - - verifyTextPresent If you don't find the appropriate entry on the selection list above: @@ -1983,7 +1963,7 @@ clickAndWait - //h3[@id='reproduces']/a/img + css=a.add-reproduces @@ -1991,11 +1971,6 @@ Edit - - verifyTextPresent - Select an existing Document for Nintendo O.K. for Kids - - verifyTextPresent If you don't find the appropriate entry on the selection list above: diff --git a/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html b/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html index 4c1a67b5..35dc60be 100644 --- a/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html +++ b/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html @@ -186,6 +186,16 @@ Edit + + waitForElementPresent + tinymce + + + + type + tinymce + seeker of truth + clickAndWait id=submit @@ -1171,7 +1181,7 @@ //div[@id='wrapper-content']/div/ul/li[4]/p/strong Baker - + clickAndWait link=Atlantis @@ -1202,11 +1212,26 @@ Individual Editing Form + + click + id=9900editLink + + + + waitForElementPresent + tinymce + + type - name=Name + tinymce Lemuria + + click + id=9900okLink + + clickAndWait id=primaryAction @@ -1222,7 +1247,7 @@ 5000 - + type name=querytext @@ -1235,33 +1260,664 @@ assertTitle - Atlantis - VIVO Search Results + Search for 'Atlantis' - verifyElementNotPresent - link=Atlantis + verifyText + css=h2 + Search for 'Atlantis' + + + verifyText + css=p + No matching results. + + + + type + name=querytext + Lemuria + + + clickAndWait + css=input.search - verifyElementNotPresent + assertTitle + Lemuria - VIVO Search Results + + + + verifyText + css=h2.searchResultsHeader + Search results for 'Lemuria' + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=locations + + + + verifyElementPresent + link=Lemuria + + + + verifyText + css=span.display-title + Continent + + + verifyElementPresent link=Baker, Able - - - + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Honcho + + + verifyText + css=strong + Lemuria + + + + type + name=querytext + baker + + + clickAndWait + css=input.search - - - + assertTitle + baker - VIVO Search Results - - + + verifyText + css=h2.searchResultsHeader + Search results for 'baker' + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=organizations + + + + verifyElementPresent + link=research + + + + verifyElementPresent + link=locations + + + + verifyElementPresent + link=Baker, Able + + + + verifyText + css=span.display-title + Honcho + + + verifyElementPresent + link=Advanced Tinkering + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Department + + + verifyText + css=strong + Baker + + + verifyElementPresent + link=Thoughts + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/span + Academic Article + + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/p/strong + Baker + + + verifyElementPresent + link=Lemuria + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[4]/span + Continent + + + verifyText + //div[@id='wrapper-content']/div/ul/li[4]/p + ... Baker, Able ... + + + + selectWindow + null + + + + clickAndWait + link=Advanced Tinkering + + + + assertTitle + Advanced Tinkering + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + id=9903editLink + + + + waitForElementPresent + tinymce + + + + type + tinymce + Advanced Puttering + + + click + id=9903okLink + + + + clickAndWait + id=primaryAction + + + + assertTitle + Individual Control Panel + + + + pause + 5000 + + + + + type + name=querytext + tinkering + + + clickAndWait + css=input.search + + + + assertTitle + Search for 'tinkering' + + + + verifyText + css=h2 + Search for 'tinkering' + + + verifyText + css=p + No matching results. + + + + type + name=querytext + puttering + + + clickAndWait + css=input.search + + + + assertTitle + puttering - VIVO Search Results + + + + verifyText + css=h2.searchResultsHeader + Search results for 'puttering' + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=organizations + + + + verifyElementPresent + link=Advanced Puttering + + + + verifyText + css=span.display-title + Department + + + verifyElementPresent + link=Baker, Able + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Honcho + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/p + ... Advanced Puttering ... + + + + type + name=querytext + baker + + + clickAndWait + css=input.search + + + + assertTitle + baker - VIVO Search Results + + + + verifyText + css=h2.searchResultsHeader + Search results for 'baker' + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=organizations + + + + verifyElementPresent + link=research + + + + verifyElementPresent + link=locations + + + + verifyElementPresent + link=Baker, Able + + + + verifyText + css=span.display-title + Honcho + + + verifyElementPresent + link=Thoughts + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Academic Article + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/p + ... Baker, Able ... + + + verifyElementPresent + link=Advanced Puttering + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/span + Department + + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/p + ... Baker, Able ... + + + verifyElementPresent + link=Lemuria + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[4]/span + Continent + + + verifyText + //div[@id='wrapper-content']/div/ul/li[4]/p/strong + Baker + + + + clickAndWait + link=Thoughts + + + + assertTitle + Thoughts + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + id=9915editLink + + + + waitForElementPresent + tinymce + + + + type + tinymce + Musings + + + click + id=9915okLink + + + + clickAndWait + id=primaryAction + + + + assertTitle + Individual Control Panel + + + + pause + 5000 + + + + + type + name=querytext + thoughts + + + clickAndWait + css=input.search + + + + assertTitle + Search for 'thoughts' + + + + verifyText + css=h2 + Search for 'thoughts' + + + verifyText + css=p + No matching results. + + + + type + name=querytext + musings + + + clickAndWait + css=input.search + + + + assertTitle + musings - VIVO Search Results + + + + verifyText + css=h2.searchResultsHeader + Search results for 'musings' + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=research + + + + verifyElementPresent + link=Musings + + + + verifyText + css=span.display-title + Academic Article + + + verifyElementPresent + link=Baker, Able + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Honcho + + + verifyText + css=strong + Musings + + + + type + name=querytext + baker + + + clickAndWait + css=input.search + + + + assertTitle + baker - VIVO Search Results + + + + verifyText + css=h2.searchResultsHeader + Search results for 'baker' + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=organizations + + + + verifyElementPresent + link=research + + + + verifyElementPresent + link=locations + + + + verifyElementPresent + link=Baker, Able + + + + verifyText + css=span.display-title + Honcho + + + verifyElementPresent + link=Advanced Puttering + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[2]/span + Department + + + verifyText + css=strong + Baker + + + verifyElementPresent + link=Musings + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/span + Academic Article + + + verifyText + //div[@id='wrapper-content']/div/ul/li[3]/p + ... Baker, Able ... + + + verifyElementPresent + link=Lemuria + + + + verifyText + //div[@id='wrapper-content']/div/ul/li[4]/span + Continent + + + verifyText + //div[@id='wrapper-content']/div/ul/li[4]/p + ... Baker, Able ... + clickAndWait