From 318dc65804864d37637294167580b84def5282c5 Mon Sep 17 00:00:00 2001 From: tworrall Date: Fri, 8 Nov 2013 17:06:59 -0500 Subject: [PATCH 1/2] VIVO-439, VIVO-507, VIVO-509, VIVO-512 --- .../themes/wilma/i18n/all_es.properties | 1 + .../listViewConfig-awardOrHonorGiven.xml | 136 ++++++++++++++++++ .../propStatement-awardOrHonorGiven.ftl | 40 ++++++ .../edit/forms/subjectHasMailingAddress.ftl | 2 +- rdf/display/everytime/PropertyConfig.n3 | 16 +++ ...OutreachProviderRoleToPersonGenerator.java | 1 + .../solr/VivoAgentContextNodeFields.java | 79 +++++----- .../search/solr/VivoISFAdvisingFields.java | 3 +- themes/wilma/i18n/all.properties | 1 + 9 files changed, 244 insertions(+), 35 deletions(-) create mode 100644 productMods/config/listViewConfig-awardOrHonorGiven.xml create mode 100644 productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl diff --git a/languages/example/themes/wilma/i18n/all_es.properties b/languages/example/themes/wilma/i18n/all_es.properties index 35ac2536..0b02b0cc 100644 --- a/languages/example/themes/wilma/i18n/all_es.properties +++ b/languages/example/themes/wilma/i18n/all_es.properties @@ -120,6 +120,7 @@ missing_info_resource = falta de recursos de información award_receipt_name = Nombre del premio recibido award_name = Nombre del premio conferred_by = conferida por +conferred_on = conferida a selected_award = Premio Seleccionado incomplete_date_time_interval = intervalo de la fecha / hora incompleta diff --git a/productMods/config/listViewConfig-awardOrHonorGiven.xml b/productMods/config/listViewConfig-awardOrHonorGiven.xml new file mode 100644 index 00000000..6b7ead3e --- /dev/null +++ b/productMods/config/listViewConfig-awardOrHonorGiven.xml @@ -0,0 +1,136 @@ + + + + + + + + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> + PREFIX bibo: <http://purl.org/ontology/bibo/> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX owl: <http://www.w3.org/2002/07/owl#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + + SELECT DISTINCT ?awardReceipt + ?receiptLabel + ?award + ?awardLabel + ?givenTo + ?givenToLabel + ?dateTimeStart + ?dateTimeEnd + ?dateTime + + WHERE { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } + OPTIONAL { ?awardReceipt core:relates ?award . + ?award a core:Award . + ?award core:relatedBy ?awardReceipt . + ?award rdfs:label ?awardLabel + } + OPTIONAL { ?awardReceipt core:relates ?givenTo . + ?givenTo rdfs:label ?givenToLabel + } + OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } + OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } + OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime + } + } ORDER BY DESC(?dateTime) DESC(?dateTimeEnd) + + + + PREFIX bibo: <http://purl.org/ontology/bibo/> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + + CONSTRUCT { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + ?awardReceipt core:relates ?award . + ?award a core:Award . + ?award core:relatedBy ?awardReceipt . + ?award rdfs:label ?awardLabel . + ?awardReceipt core:relates ?givenTo . + ?givenTo rdfs:label ?givenToLabel . + ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime + } WHERE { + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + } UNION { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel + } UNION { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + ?awardReceipt core:relates ?award . + ?award a core:Award . + ?award core:relatedBy ?awardReceipt . + ?award rdfs:label ?awardLabel + } UNION { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + ?awardReceipt core:relates ?givenTo . + ?givenTo a foaf:Person . + ?givenTo rdfs:label ?givenToLabel + } UNION { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime + } + } + + + + PREFIX core: <http://vivoweb.org/ontology/core#> + CONSTRUCT { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } WHERE { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } + + + + PREFIX core: <http://vivoweb.org/ontology/core#> + CONSTRUCT { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } WHERE { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } + + + diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl new file mode 100644 index 00000000..16d9b85b --- /dev/null +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl @@ -0,0 +1,40 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Custom object property statement view for faux property "awards and honors". See the PropertyConfig.3 file for details. + + This template must be self-contained and not rely on other variables set for the individual page, because it + is also used to generate the property statement during a deletion. + --> +<#import "lib-sequence.ftl" as s> +<#import "lib-datetime.ftl" as dt> +<@showAward statement /> + +<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the + next statement --> +<#macro showAward statement> + + <#local linkedIndividual> + <#if statement.award??> + ${statement.awardLabel!} + <#else> + ${statement.receiptLabel!} + + + + <#local dateTimeVal> + <#if statement.dateTime??> + <@dt.yearSpan statement.dateTime! /> + <#else> + <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> + + + + <#local conferredOn> + <#if statement.givenTo?has_content && statement.givenToLabel?has_content> + ${i18n().conferred_on} ${statement.givenToLabel} + + + + <@s.join [ linkedIndividual, conferredOn!, dateTimeVal! ] /> + + diff --git a/productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl b/productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl index e44041ea..f7b7cef9 100644 --- a/productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl +++ b/productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl @@ -76,7 +76,7 @@

- +

diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 77869e28..416802f9 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -41,6 +41,8 @@ local:organizationForPositionConfig a :ObjectPropertyDisplayConfig ; :displayName "people" ; :listViewConfigFile "listViewConfig-organizationForPosition.xml"^^xsd:string ; :propertyGroup ; + vitro:collateBySubclassAnnot + "true"^^xsd:boolean; vitro:displayRankAnnot 10; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; @@ -921,6 +923,20 @@ local:awardReceiptsAwardForConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . +local:awardOrHonorGivenContext a :ConfigContext ; + :hasConfiguration local:awardOrHonorGivenConfig ; + :configContextFor ; + :qualifiedByDomain ; + :qualifiedBy . + +local:awardOrHonorGivenConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-awardOrHonorGiven.xml"^^xsd:string ; + :displayName "award or honor given" ; + vitro:displayRankAnnot 72; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + :propertyGroup . + local:addressLocationContext a :ConfigContext ; :hasConfiguration local:addressLocationConfig ; :configContextFor ; diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java index ba109983..5caa2647 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java @@ -35,6 +35,7 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo "http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory", "http://vivoweb.org/ontology/core#Department","Department", "http://vivoweb.org/ontology/core#Division","Division", + "http://purl.org/NET/c4dm/event.owl#Event","Event", "http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit", "http://vivoweb.org/ontology/core#Foundation","Foundation", "http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization", diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java index 2b92bea3..3dbe47e4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java @@ -29,7 +29,8 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{ + " prefix foaf: " + " prefix rdfs: " + " prefix localNav: " - + " prefix bibo: "; + + " prefix bibo: " + + " prefix obo: \n" ; //queries for foaf:Agent @@ -49,14 +50,9 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{ " ?uri rdf:type foaf:Agent . " + " ?uri ?b ?c . " + " ?c rdf:type core:Position . " + - " ?c core:involvedOrganizationName ?ContextNodeProperty . }"); - - queriesForAgent.add(prefix + "SELECT " + - "(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" + - " ?uri rdf:type foaf:Agent . " + - " ?uri ?b ?c . " + - " ?c rdf:type core:Position . " + - " ?c core:positionInOrganization ?i . ?i rdfs:label ?ContextNodeProperty . }"); + " ?c core:relates ?i . " + + " ?i rdf:type foaf:Organization . " + + " ?i rdfs:label ?ContextNodeProperty . }"); queriesForAgent.add(prefix + "SELECT " + "(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" + @@ -70,7 +66,6 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{ queriesForAgent.add(prefix + "SELECT " + "(str(?HRJobTitle) as ?hrJobTitle) " + - "(str(?InvolvedOrganizationName) as ?involvedOrganizationName) " + "(str(?PositionInOrganization) as ?positionInOrganization) " + "(str(?TitleOrRole) as ?titleOrRole) WHERE {" @@ -78,8 +73,7 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{ + " ?c rdf:type core:Position . " + " OPTIONAL { ?c core:hrJobTitle ?HRJobTitle . } . " - + " OPTIONAL { ?c core:involvedOrganizationName ?InvolvedOrganizationName . } ." - + " OPTIONAL { ?c core:positionInOrganization ?i . ?i rdfs:label ?PositionInOrganization . } . " + + " OPTIONAL { ?c core:relates ?i . ?i rdf:type foaf:Organization . ?i rdfs:label ?PositionInOrganization . } . " + " OPTIONAL { ?c core:titleOrRole ?TitleOrRole . } . " + " }"); @@ -88,36 +82,49 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{ queriesForAgent.add(prefix + "SELECT " + "(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" + " ?uri rdf:type foaf:Agent ; ?b ?c . " + - " ?c rdf:type core:Relationship . " + - " ?c core:advisee ?d . ?d rdfs:label ?ContextNodeProperty . }"); + " ?c rdf:type core:AdvisingRelationship . " + + " ?c rdfs:label ?ContextNodeProperty . }"); queriesForAgent.add(prefix + "SELECT " + "(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" + " ?uri rdf:type foaf:Agent ; ?b ?c . " + - " ?c rdf:type core:Relationship . " + + " ?c rdf:type core:AdvisingRelationship . " + " ?c core:degreeCandidacy ?e . ?e rdfs:label ?ContextNodeProperty . }"); - + queriesForAgent.add(prefix + "SELECT " + "(str(?label) as ?adviseeLabel) WHERE {" + " ?uri rdf:type foaf:Agent ." + - " ?c rdf:type core:Relationship . " + - " ?c core:advisor ?uri . " + - " ?c core:advisee ?d . ?d rdfs:label ?label .}" ); + " ?c rdf:type core:AdvisingRelationship . " + + " ?c core:relates ?uri . " + + " ?uri obo:RO_0000053 ?advisorRole . " + + " ?advisorRole rdf:type core:AdvisorRole . " + + " ?c core:relates ?d . " + + " ?d rdf:type foaf:Person . " + + " ?d obo:RO_0000053 ?adviseeRole . " + + " ?adviseeRole rdf:type core:AdviseeRole . " + + " ?d rdfs:label ?ContextNodeProperty . }"); queriesForAgent.add(prefix + "SELECT " + "(str(?label) as ?advisorLabel) WHERE {" + " ?uri rdf:type foaf:Agent ." + - " ?c rdf:type core:Relationship . " + - " ?c core:advisee ?uri . " + - " ?c core:advisor ?d . ?d rdfs:label ?label .}" ); + " ?c rdf:type core:AdvisingRelationship . " + + " ?c core:relates ?uri . " + + " ?uri obo:RO_0000053 ?adviseeRole . " + + " ?adviseeRole rdf:type core:AdviseeRole . " + + " ?c core:relates ?d . " + + " ?d rdf:type foaf:Person . " + + " ?d obo:RO_0000053 ?advisorRole . " + + " ?advisorRole rdf:type core:AdvisorRole . " + + " ?d rdfs:label ?ContextNodeProperty . }"); /* Author */ queriesForAgent.add(prefix + "SELECT " + "(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" + " ?uri rdf:type foaf:Agent ; ?b ?c . " + - " ?c rdf:type core:Relationship . " + - " ?c core:linkedAuthor ?f . " + + " ?c rdf:type core:Authorship . " + + " ?c core:relates ?f . " + + " ?f rdf:type foaf:Person . " + " ?f rdfs:label ?ContextNodeProperty . " + " FILTER( ?f != ?uri ) " + "}"); @@ -125,8 +132,9 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{ queriesForAgent.add(prefix + "SELECT " + "(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" + " ?uri rdf:type foaf:Agent ; ?b ?c . " + - " ?c rdf:type core:Relationship . " + - " ?c core:linkedInformationResource ?h . ?h rdfs:label ?ContextNodeProperty . }"); + " ?c rdf:type core:Authorship . " + + " ?c core:relates ?h . " + + " ?h rdf:type obo:IAO_0000030 . ?h rdfs:label ?ContextNodeProperty . }"); /* Award */ @@ -138,8 +146,8 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{ "WHERE {" + " ?uri rdf:type foaf:Agent ; ?b ?c . " + " ?c rdf:type core:AwardReceipt . " - + " OPTIONAL { ?c rdfs:label ?AwardLabel . } . " - + " OPTIONAL { ?c core:awardConferredBy ?d . ?d rdfs:label ?AwardConferredBy . } . " + + " OPTIONAL { ?c core:relates ?e . ?e rdf:type core:Award . ?e rdfs:label ?AwardLabel . } . " + + " OPTIONAL { ?c core:assignedBy ?d . ?d rdf:type foaf:Organization . ?d rdfs:label ?AwardConferredBy . } . " + " OPTIONAL { ?c core:description ?Description . } . " + " }"); @@ -147,8 +155,9 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{ queriesForAgent.add(prefix + "SELECT (str(?OrganizationLabel) as ?organizationLabel) WHERE {" - + "?uri rdf:type foaf:Agent ; ?b ?c . " - + " ?c rdf:type core:Role ; core:roleIn ?Organization ." + + " ?uri rdf:type foaf:Agent ; ?b ?c . " + + " ?c rdf:type obo:BFO_0000023 ; core:roleContributesTo ?Organization ." + + " ?Organization rdf:type core:Organization . " + " ?Organization rdfs:label ?OrganizationLabel . " + " }"); @@ -163,12 +172,16 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{ "(str(?TrainingAtOrganizationLabel) as ?trainingAtOrganizationLabel) WHERE {" + " ?uri rdf:type foaf:Agent ; ?b ?c . " - + " ?c rdf:type core:EducationalTraining . " + + " ?c rdf:type core:EducationalProcess . " - + "OPTIONAL { ?c core:degreeEarned ?d . ?d rdfs:label ?AcademicDegreeLabel ; core:abbreviation ?AcademicDegreeAbbreviation . } . " + + "OPTIONAL { ?c core:relates ?d . " + + " ?d rdf:type core:AwardedDegree . " + + " ?d core:relates ?e . " + + " ?e rdf:type core:AcademicDegree . " + + " ?e rdfs:label ?AcademicDegreeLabel . } . " + "OPTIONAL { ?c core:majorField ?MajorField .} ." + " OPTIONAL { ?c core:departmentOrSchool ?DepartmentOrSchool . }" - + " OPTIONAL { ?c core:trainingAtOrganization ?e . ?e rdfs:label ?TrainingAtOrganizationLabel . } . " + + " OPTIONAL { ?c obo:RO_0000057 ?f . ?f rdf:type foaf:organization . ?f rdfs:label ?TrainingAtOrganizationLabel . } . " +"}"); } } diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java index 85e60b91..26db9076 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java @@ -47,7 +47,8 @@ public class VivoISFAdvisingFields extends ContextNodeFields { " ?uri core:relatedBy ?rel . \n" + " ?rel rdf:type core:AdvisingRelationship . \n" + " ?rel core:relates ?other . \n" + - " ?other rdfs:label ?result . \n" + + " ?other rdfs:label ?result . \n" + + " FILTER( ?other != ?uri ) \n" + "}"; } diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties index 158f250a..3d43c23c 100644 --- a/themes/wilma/i18n/all.properties +++ b/themes/wilma/i18n/all.properties @@ -120,6 +120,7 @@ missing_info_resource = missing information resource award_receipt_name = award receipt name award_name = award name conferred_by = conferred by +conferred_on = conferred on selected_award = Selected Award incomplete_date_time_interval = incomplete date/time interval From fb26ee734fe872c9252329e66cf6fdbfceffda73 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Sun, 10 Nov 2013 18:34:31 -0500 Subject: [PATCH 2/2] More RC 2 test case updates from Holly --- .../AddPublications/ValidateFields.html | 30 +- .../AddRoles/AddFacultyMemberRoles2.html | 257 ++++- .../AddRoles/AddFacultyMemberRoles3.html | 8 +- .../suites/AddRoles/AddLibrarianRoles1.html | 99 +- .../suites/AddRoles/AddLibrarianRoles2.html | 14 +- .../suites/AddRoles/CheckIndexView.html | 73 +- .../suites/AddRoles/CheckPublicView.html | 333 ++++--- .../suites/AddRoles/CheckRepairMode.html | 27 +- .../suites/AddRoles/DeleteIndexStuff.html | 900 +++++++++--------- .../suites/AddRoles/GrantDisplay.html | 27 +- .../AddRoles/VerifyAllRolesSearchable.html | 123 ++- .../CheckVisualizations/AddPublications.html | 8 +- .../CheckVisualizations/CheckGrantDates.html | 5 + .../CheckVisualizations/DeleteIndexStuff.html | 801 ++++++++-------- .../TestTemporalGraphs.html | 94 +- .../suites/CreatePeople/AddFacultyInfo.html | 202 ++-- .../CreatePeople/CreateFacultyMember.html | 20 +- .../suites/CreatePeople/CreateLibrarian.html | 15 + .../suites/CreatePeople/EditFacultyInfo.html | 20 +- .../suites/SelfEditing/AddSelfEditorId.html | 2 +- .../CheckSelfEditorPrivileges.html | 18 +- .../SelfEditing/CreateNewSelfEditorUser.html | 2 +- .../suites/SelfEditing/DeleteFacultyInfo.html | 2 +- .../SelfEditing/DeleteNewSelfEditorUser.html | 2 +- 24 files changed, 1804 insertions(+), 1278 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index c4efcd06..87b2fa9e 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -94,7 +94,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -136,7 +136,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -179,7 +179,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -390,13 +390,13 @@ - verifyElementPresent - link=Nintendo O.K. for Kids + verifyTextPresent + Nintendo O.K. for Kids.  Raising Children in the 21st Century. Ed. Mouse, Minnie.  New York: Marcel Dekker. 123-144. 2009 - verifyTextPresent - Nintendo O.K. for Kids.  Raising Children in the 21st Century. Ed. Mouse, Minnie.  New York: Marcel Dekker. 123-144.  2009 + verifyElementPresent + link=Nintendo O.K. for Kids @@ -492,7 +492,7 @@ assertTitle - Crop Photo for Nintendo O.K. for Kids + Crop image for Nintendo O.K. for Kids @@ -527,7 +527,7 @@ assertTitle - Crop Photo for Nintendo O.K. for Kids + Crop image for Nintendo O.K. for Kids @@ -548,7 +548,7 @@ clickAndWait - css=img.add-individual + css=a.add-ARG_2000028 > img.add-individual @@ -606,16 +606,6 @@ link=Cancel - - assertTitle - Nintendo O.K. for Kids - - - - clickAndWait - css=img.add-individual - - assertTitle Edit diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html index d8db41c4..e87fb5e0 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html @@ -111,6 +111,31 @@ Research Activity Type + + verifyTextPresent + Research Activity Name + + + + verifyTextPresent + Role in Research Activity + + + + verifyTextPresent + Years of Participation + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + clickAndWait link=Cancel @@ -142,6 +167,31 @@ Research Activity Type + + verifyTextPresent + Research Activity Name + + + + verifyTextPresent + Role in Research Activity + + + + verifyTextPresent + Years of Participation + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + select typeSelector @@ -198,21 +248,16 @@ Edit - - verifyTextPresent - Create research activity entry for Faculty, Jane - - - - verifyTextPresent - Research Activity Type - - select typeSelector label=Project + + verifyTextPresent + Create research activity entry for Faculty, Jane + + verifyTextPresent Research Activity Type @@ -745,7 +790,7 @@ clickAndWait - xpath=(//img[@alt='add'])[10] + xpath=(//img[@alt='add'])[11] @@ -862,7 +907,7 @@ clickAndWait - xpath=(//img[@alt='add'])[10] + xpath=(//img[@alt='add'])[11] @@ -979,7 +1024,7 @@ click - css=li.nonSelectedGroupTab.clickable + //div[@id='wrapper-content']/ul/li[20] @@ -1062,6 +1107,192 @@ Ape World Planner 2009 + + + clickAndWait + link=Home + + + + assertTitle + VIVO + + + + clickAndWait + link=View all ... + + + + assertTitle + Research + + + + verifyElementPresent + link=Grant (5) + + + + verifyElementPresent + link=Habitats for Apes + + + + verifyElementPresent + link=NIH VIVO + + + + verifyElementPresent + link=NIH VIVO Too + + + + verifyElementPresent + link=VIVO Cornell Grant + + + + verifyElementPresent + link=VIVO Cornell Grant Too + + + + clickAndWait + link=Home + + + + assertTitle + VIVO + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Assistant Professor + + + + clickAndWait + css=a[alt="view all faculty"] + + + + assertTitle + People + + + + verifyElementPresent + link=Faculty Member (1) + + + + verifyElementPresent + link=Librarian (1) + + + + verifyElementPresent + link=Person (2) + + + + click + link=Faculty Member (1) + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Assistant Professor + + + + click + link=Librarian (1) + + + + verifyElementPresent + link=Librarian, Lily + + + + verifyTextPresent + Associate Librarian + + + + click + link=Person (2) + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Assistant Professor + + + + verifyElementPresent + link=Librarian, Lily + + + + verifyTextPresent + Associate Librarian + + + + clickAndWait + link=Home + + + + assertTitle + VIVO + + + + verifyElementPresent + css=p.stats-count + + + + verifyElementPresent + //ul[@id='stats']/li[2]/a/p + + + + verifyElementPresent + //ul[@id='stats']/li[3]/a/p + + + + verifyElementPresent + //ul[@id='stats']/li[4]/a/p + + + + verifyElementPresent + //ul[@id='stats']/li[5]/a/p + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html index 390ac821..4e07dcdc 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html @@ -261,13 +261,13 @@ - verifyElementPresent - link=PoA Annual Conference + verifyTextPresent + PoA Annual Conference 2000 - 2010 - verifyTextPresent - 2000 - 2010 + verifyElementPresent + link=PoA Annual Conference diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html index d83af41f..e8a83e7a 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html @@ -59,7 +59,7 @@ loginForm - + clickAndWait link=Index @@ -157,6 +157,11 @@ Role in Presentation + + verifyTextPresent + Presented At + + verifyTextPresent Years of Participation @@ -213,6 +218,11 @@ Role in Presentation + + verifyTextPresent + Presented At + + verifyTextPresent Years of Participation @@ -274,6 +284,11 @@ Role in Presentation + + verifyTextPresent + Presented At + + verifyTextPresent Years of Participation @@ -477,6 +492,11 @@ roleLabel Member of panel + + type + id=conference + USAIN Conference + type startField-year @@ -519,6 +539,21 @@ + + click + //div[@id='wrapper-content']/ul/li[20] + + + + verifyTextPresent + invited talk + + + + verifyTextPresent + Animal Librarianship, Member of panel, USAIN Conference 2003 + + verifyElementPresent link=Animal Librarianship @@ -526,7 +561,12 @@ verifyTextPresent - Member of panel 2003 + presentation + + + + verifyTextPresent + Researching Primates, Presenter 2009 @@ -534,11 +574,6 @@ link=Researching Primates - - verifyTextPresent - Presenter 2009 - - click @@ -547,7 +582,7 @@ clickAndWait - css=#serviceGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual + xpath=(//img[@alt='add'])[29] @@ -659,7 +694,7 @@ clickAndWait - css=#serviceGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual + xpath=(//img[@alt='add'])[29] @@ -769,14 +804,9 @@ //div[@id='wrapper-content']/ul/li[10] - - verifyElementPresent - link=Primates of the World - - verifyTextPresent - Board 2001 - 2003 + Carroll College Consultant 2010 - @@ -786,7 +816,12 @@ verifyTextPresent - Consultant 2010 - + Primates of the World Board 2001 - 2003 + + + + verifyElementPresent + link=Primates of the World @@ -797,7 +832,7 @@ clickAndWait - xpath=(//img[@alt='add'])[29] + xpath=(//img[@alt='add'])[30] @@ -822,17 +857,17 @@ verifyTextPresent - Committee Name + Organization Name verifyTextPresent - Role in Committee + Role in Organization verifyTextPresent - Years of Participation in Committee + Years of Participation @@ -904,7 +939,7 @@ clickAndWait - //h3[@id='hasOutreachProviderRole']/a/img + xpath=(//img[@alt='add'])[30] @@ -925,21 +960,21 @@ select typeSelector - label=Event + label=Association verifyTextPresent - Event Name + Organization Name verifyTextPresent - Role in Event + Role in Organization verifyTextPresent - Years of Participation in Event + Years of Participation @@ -1009,14 +1044,9 @@ - - verifyElementPresent - link=Show Me the Primates! - - verifyTextPresent - Booth 2001 + Librarians for the Better Treatment of Primates Chair 2009 - @@ -1026,7 +1056,12 @@ verifyTextPresent - Chair 2009 - + Show Me the Primates! Booth 2001 + + + + verifyElementPresent + link=Show Me the Primates! diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html index a21808f0..02c249c2 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html @@ -200,7 +200,7 @@ clickAndWait - xpath=(//img[@alt='add'])[8] + xpath=(//img[@alt='add'])[9] @@ -305,11 +305,6 @@ - - verifyElementPresent - link=Reference Division - - verifyTextPresent Reference Division Head Librarian 2009 - @@ -317,7 +312,7 @@ verifyElementPresent - link=Amercian Library Association + link=Reference Division @@ -325,6 +320,11 @@ Amercian Library Association Member 1988 - + + verifyElementPresent + link=Amercian Library Association + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html index 030af60e..edf84d92 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html @@ -40,11 +40,6 @@ people - - verifyElementPresent - link=Faculty Member - - verifyTextPresent Faculty Member (1) @@ -87,12 +82,12 @@ verifyTextPresent - Conference (2) + Conference (3) verifyTextPresent - Event (6) + Event (7) @@ -117,7 +112,7 @@ verifyTextPresent - Association (1) + Association (3) @@ -125,11 +120,21 @@ College (1) + + verifyTextPresent + Committee (1) + + verifyTextPresent Department (1) + + verifyTextPresent + Group (1) + + verifyTextPresent Museum (1) @@ -137,7 +142,7 @@ verifyTextPresent - Organization (4) + Organization (5) @@ -150,26 +155,6 @@ Grant (5) - - verifyTextPresent - Committee (1) - - - - verifyTextPresent - Agreement (5) - - - - verifyTextPresent - Service (1) - - - - verifyTextPresent - Group (1) - - verifyElementPresent @@ -231,11 +216,21 @@ link=College + + verifyElementPresent + link=Committee + + verifyElementPresent link=Department + + verifyElementPresent + link=Group + + verifyElementPresent link=Museum @@ -251,26 +246,6 @@ link=Grant - - verifyElementPresent - link=Agreement - - - - verifyElementPresent - link=Service - - - - verifyElementPresent - link=Committee - - - - verifyElementPresent - link=Group - - clickAndWait diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html index fa85c448..b51648be 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html @@ -54,70 +54,15 @@ Faculty, Jane - - selectWindow - null - - click //div[@id='wrapper-content']/ul/li[20] - - verifyElementPresent - link=NIH VIVO - - verifyTextPresent - NIH VIVO 2009 - 2010 - - - - verifyElementPresent - link=VIVO Cornell Grant - - - - verifyTextPresent - VIVO Cornell Grant 2007 - 2009 - - - - verifyElementPresent - link=VIVO Cornell Grant Too - - - - verifyTextPresent - VIVO Cornell Grant Too 2009 - - - - verifyElementPresent - link=NIH VIVO Too - - - - verifyTextPresent - NIH VIVO Too 2010 - - - - - verifyElementPresent - link=Prototype New Ape Home - - - - verifyTextPresent - Prototype New Ape Home Designer 1990 - 1991 - - - - verifyElementPresent - link=Ape Health Program + clinical activities @@ -127,7 +72,77 @@ verifyElementPresent - link=History of Apes in Africa + link=Ape Health Program + + + + verifyTextPresent + Prototype New Ape Home Designer 1990 - 1991 + + + + verifyElementPresent + link=Prototype New Ape Home + + + + verifyTextPresent + principal investigator on + + + + verifyTextPresent + NIH VIVO Too 2010 - + + + + verifyElementPresent + link=NIH VIVO Too + + + + verifyTextPresent + co-principal investigator on + + + + verifyTextPresent + NIH VIVO 2009 - 2010 + + + + verifyElementPresent + link=NIH VIVO + + + + verifyTextPresent + VIVO Cornell Grant 2007 - 2009 + + + + verifyElementPresent + link=VIVO Cornell Grant + + + + verifyTextPresent + investigator on + + + + verifyTextPresent + VIVO Cornell Grant Too 2009 + + + + verifyElementPresent + link=VIVO Cornell Grant Too + + + + verifyTextPresent + other research activities @@ -137,7 +152,7 @@ verifyElementPresent - link=Habitats for Apes + link=History of Apes in Africa @@ -147,22 +162,17 @@ verifyElementPresent - link=Working with Primates + link=Habitats for Apes verifyTextPresent - Working with Primates Co-Instructor 2000 - 2005 - - - - verifyElementPresent - link=Introduction to the Ape World + teaching activities verifyTextPresent - Introduction to the Ape World Creator 2000 - 2001 + Ape World Planner 2009 @@ -172,7 +182,37 @@ verifyTextPresent - Ape World Planner 2009 + Working with Primates Co-Instructor 2000 - 2005 + + + + verifyElementPresent + link=Working with Primates + + + + verifyTextPresent + Introduction to the Ape World Creator 2000 - 2001 + + + + verifyElementPresent + link=Introduction to the Ape World + + + + verifyTextPresent + attended + + + + verifyTextPresent + PoA Annual Conference 2000 - 2010 + + + + verifyElementPresent + link=PoA Annual Conference @@ -207,69 +247,9 @@ //div[@id='wrapper-content']/ul/li[20] - - verifyElementPresent - link=Animal Librarianship - - verifyTextPresent - Animal Librarianship, Member of panel 2003 - - - - verifyElementPresent - link=Researching Primates - - - - verifyTextPresent - Researching Primates, Presenter 2009 - - - - verifyElementPresent - link=Primates of the World - - - - verifyTextPresent - Primates of the World Board 2001 - 2003 - - - - verifyElementPresent - link=Carroll College - - - - verifyTextPresent - Carroll College Consultant 2010 - - - - - verifyElementPresent - link=Show Me the Primates! - - - - verifyTextPresent - Show Me the Primates! Booth 2001 - - - - verifyElementPresent - link=Librarians for the Better Treatment of Primates - - - - verifyTextPresent - Librarians for the Better Treatment of Primates Chair 2009 - - - - - verifyElementPresent - link=Reference Division + head of @@ -279,7 +259,12 @@ verifyElementPresent - link=Amercian Library Association + link=Reference Division + + + + verifyTextPresent + member of @@ -287,6 +272,96 @@ Amercian Library Association Member 1988 - + + verifyElementPresent + link=Amercian Library Association + + + + verifyTextPresent + presentations + + + + verifyTextPresent + invited talk + + + + verifyTextPresent + Animal Librarianship, Member of panel, USAIN Conference 2003 + + + + verifyElementPresent + link=Animal Librarianship + + + + verifyTextPresent + presentation + + + + verifyTextPresent + Researching Primates, Presenter 2009 + + + + verifyElementPresent + link=Researching Primates + + + + verifyTextPresent + service to the profession + + + + verifyTextPresent + Carroll College Consultant 2010 - + + + + verifyElementPresent + link=Carroll College + + + + verifyTextPresent + Primates of the World Board 2001 - 2003 + + + + verifyElementPresent + link=Primates of the World + + + + verifyTextPresent + outreach and community service + + + + verifyTextPresent + Librarians for the Better Treatment of Primates Chair 2009 - + + + + verifyElementPresent + link=Librarians for the Better Treatment of Primates + + + + verifyTextPresent + Show Me the Primates! Booth 2001 + + + + verifyElementPresent + link=Show Me the Primates! + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html index dd62744e..fc53a0e6 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html @@ -88,7 +88,7 @@ clickAndWait - xpath=(//img[@alt='add'])[8] + xpath=(//img[@alt='add'])[9] @@ -326,7 +326,7 @@ clickAndWait - xpath=(//img[@alt='edit'])[5] + xpath=(//img[@alt='edit this entry'])[4] @@ -357,7 +357,12 @@ verifyTextPresent - Please enter or select a value in the Name field. + Please select a type from the drop-down list. + + + + verifyTextPresent + Please select an existing value or enter a new value in the Name field. @@ -378,17 +383,17 @@ verifyTextPresent - Association Name + Organization Name verifyTextPresent - Role in Association + Role in Organization verifyTextPresent - Years of Participation in Association + Years of Participation @@ -414,7 +419,7 @@ verifyTextPresent - Please enter or select a value in the Name field. + Please select an existing value or enter a new value in the Name field. @@ -449,13 +454,13 @@ - verifyElementPresent - link=LITA Too + verifyTextPresent + Member at Large 1999 - 2009 - verifyTextPresent - Member at Large 1999 - 2009 + verifyElementPresent + link=LITA Too diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html index 82b635c2..4d244da2 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html @@ -66,6 +66,16 @@ + + verifyTextPresent + activities + + + + verifyTextPresent + Project + + verifyTextPresent courses @@ -76,31 +86,6 @@ Course - - verifyTextPresent - activities - - - - verifyTextPresent - Agreement - - - - verifyTextPresent - Grant - - - - verifyTextPresent - Project - - - - verifyTextPresent - Service - - verifyTextPresent events @@ -111,6 +96,11 @@ Conference + + verifyTextPresent + Event + + verifyTextPresent Invited Talk @@ -166,357 +156,17 @@ Organization + + verifyTextPresent + research + + + + verifyTextPresent + Grant + + - - clickAndWait - link=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=Habitats for Apes - - - - assertTitle - Habitats for Apes - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _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=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=NIH VIVO - - - - assertTitle - NIH VIVO - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _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=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=NIH VIVO Too - - - - assertTitle - NIH VIVO Too - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _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=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=VIVO Cornell Grant - - - - assertTitle - VIVO Cornell Grant - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _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=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=VIVO Cornell Grant Too - - - - assertTitle - VIVO Cornell Grant Too - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _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=Project @@ -652,81 +302,6 @@ link=Index - - assertTitle - Index of Contents - - - - 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 - _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 @@ -1149,6 +724,76 @@ Index of Contents + + clickAndWait + link=Conference + + + + assertTitle + Conference + + + + clickAndWait + link=USAIN Conference + + + + assertTitle + USAIN 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 @@ -1637,12 +1282,12 @@ clickAndWait - link=Event + link=Association assertTitle - Event + Association @@ -1695,6 +1340,357 @@ VIVO Site Administration + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Habitats for Apes + + + + assertTitle + Habitats for Apes + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _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=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=NIH VIVO + + + + assertTitle + NIH VIVO + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _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=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=NIH VIVO Too + + + + assertTitle + NIH VIVO Too + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _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=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=VIVO Cornell Grant + + + + assertTitle + VIVO Cornell Grant + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _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=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=VIVO Cornell Grant Too + + + + assertTitle + VIVO Cornell Grant Too + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _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/AddRoles/GrantDisplay.html b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html index 8192dfb1..740b5b70 100644 --- a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html +++ b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html @@ -65,7 +65,7 @@ link=Index - + clickAndWait link=Faculty Member @@ -88,13 +88,8 @@ - verifyTextPresent - History of Apes in Africa Consultant 2010 - - - - - verifyTextPresent - Habitats for Apes Researcher 1980 - 1985 + click + //div[@id='wrapper-content']/ul/li[20] @@ -117,6 +112,16 @@ VIVO Cornell Grant Too 2009 + + verifyTextPresent + History of Apes in Africa Consultant 2010 - + + + + verifyTextPresent + Habitats for Apes Researcher 1980 - 1985 + + verifyTextPresent @@ -195,7 +200,7 @@ clickAndWait - link=Return to profile page + link=Return to Profile Page @@ -267,7 +272,7 @@ clickAndWait - link=Return to profile page + link=Return to Profile Page @@ -339,7 +344,7 @@ clickAndWait - link=Return to profile page + link=Return to Profile Page diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html index 530a789c..0221cb19 100644 --- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html +++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html @@ -34,14 +34,19 @@ querytext VIVO + + clickAndWait + //input[@value='Search'] + + assertTitle VIVO - VIVO Search Results - clickAndWait - //input[@value='Search'] + verifyElementPresent + link=people @@ -56,7 +61,7 @@ verifyTextPresent - NIH VIVO Grant + VIVO @@ -66,7 +71,7 @@ verifyTextPresent - VIVO Cornell Grant + NIH VIVO Grant @@ -74,11 +79,26 @@ VIVO Cornell Grant Too + + verifyTextPresent + VIVO Cornell Grant + + + + verifyTextPresent + Faculty, Jane Assistant Professor + + verifyElementPresent link=VIVO + + verifyElementPresent + link=NIH VIVO Too + + verifyElementPresent link=NIH VIVO @@ -86,7 +106,7 @@ verifyElementPresent - link=NIH VIVO Too + link=VIVO Cornell Grant Too @@ -96,7 +116,7 @@ verifyElementPresent - link=VIVO Cornell Grant Too + link=Faculty, Jane @@ -157,12 +177,12 @@ verifyTextPresent - Ape Health Program + Introduction to the Ape World Course verifyTextPresent - Introduction to the Ape World Course + Ape Health Program @@ -177,7 +197,7 @@ verifyTextPresent - Faculty, Jane Faculty Member + Faculty, Jane Assistant Professor @@ -192,12 +212,12 @@ verifyElementPresent - link=Ape Health Program + link=Introduction to the Ape World verifyElementPresent - link=Introduction to the Ape World + link=Ape Health Program @@ -241,6 +261,11 @@ link=organizations + + verifyTextPresent + Show Me the Primates! Association + + verifyTextPresent Primates of the World Museum @@ -258,12 +283,12 @@ verifyTextPresent - Show Me the Primates! Event + Librarians for the Better Treatment of Primates Committee - verifyTextPresent - Librarians for the Better Treatment of Primates Committee + verifyElementPresent + link=Show Me the Primates! @@ -281,11 +306,6 @@ link=Working with Primates - - verifyElementPresent - link=Show Me the Primates! - - verifyElementPresent link=Librarians for the Better Treatment of Primates @@ -378,6 +398,16 @@ link=Animal Librarianship + + verifyTextPresent + USAIN Conference Conference + + + + verifyElementPresent + link=USAIN Conference + + type @@ -461,16 +491,61 @@ link=people + + verifyElementPresent + link=research + + verifyTextPresent Faculty, Jane Assistant Professor + + verifyTextPresent + NIH VIVO Too Grant + + + + verifyTextPresent + NIH VIVO Grant + + + + verifyTextPresent + VIVO Cornell Grant Too Grant + + + + verifyTextPresent + VIVO Cornell Grant Grant + + verifyElementPresent link=Faculty, Jane + + verifyElementPresent + link=NIH VIVO Too + + + + verifyElementPresent + link=NIH VIVO + + + + verifyElementPresent + link=VIVO Cornell Grant Too + + + + verifyElementPresent + link=VIVO Cornell Grant + + type @@ -487,6 +562,16 @@ Search results for 'poa' + + verifyTextPresent + PoA Annual Conference Conference + + + + verifyElementPresent + link=PoA Annual Conference + + clickAndWait diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html index adda3d03..863fb834 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -93,7 +93,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -290,7 +290,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -477,7 +477,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual @@ -654,7 +654,7 @@ clickAndWait - css=a.add-relatedBy > img.add-individual + css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html index 4a0aa2c2..be46b954 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html @@ -653,6 +653,11 @@ + + click + //div[@id='wrapper-content']/ul/li[6] + + verifyTextPresent Games and Kids: The Impact 2011 - diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html index 08bc9348..e3173570 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html @@ -66,11 +66,6 @@ - - verifyTextPresent - activities - - verifyTextPresent events @@ -86,267 +81,6 @@ research - - - clickAndWait - link=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=Childhood Development in the 21st Century - - - - assertTitle - Childhood Development in the 21st Century - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - clickAndWait - link=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=Future of Children - - - - assertTitle - Future of Children - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - clickAndWait - link=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=Games and Kids: The Impact - - - - assertTitle - Games and Kids: The Impact - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - clickAndWait - link=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=Nix Nintendo? - - - - assertTitle - Nix Nintendo? - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - clickAndWait @@ -479,6 +213,136 @@ link=Index + + clickAndWait + link=Organization + + + + assertTitle + Organization + + + + 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 + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + clickAndWait + link=Organization + + + + assertTitle + Organization + + + + clickAndWait + link=College of Human Ecology + + + + assertTitle + College of Human Ecology + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + clickAndWait @@ -735,136 +599,6 @@ link=Index - - clickAndWait - link=Organization - - - - assertTitle - Organization - - - - 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 - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - clickAndWait - link=Organization - - - - assertTitle - Organization - - - - clickAndWait - link=College of Human Ecology - - - - assertTitle - College of Human Ecology - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - clickAndWait link=Journal @@ -925,6 +659,276 @@ VIVO Site Administration + + selectWindow + null + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Childhood Development in the 21st Century + + + + assertTitle + Childhood Development in the 21st Century + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Future of Children + + + + assertTitle + Future of Children + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Games and Kids: The Impact + + + + assertTitle + Games and Kids: The Impact + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Nix Nintendo? + + + + assertTitle + Nix Nintendo? + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value="Edit This Individual"] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + clickAndWait @@ -941,11 +945,6 @@ 10000 - - verifyTextNotPresent - activities - - verifyTextNotPresent events diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index 83e0f4ba..c74467ff 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -101,9 +101,19 @@ + + click + //div[@id='wrapper-content']/ul/li[14] + + clickAndWait - //h3[@id='organizationForPosition']/a/img + css=a.add-relatedBy > img.add-individual + + + + assertTitle + Edit @@ -148,7 +158,7 @@ clickAndWait - //h3[@id='organizationForPosition']/a/img + css=a.add-relatedBy > img.add-individual @@ -193,7 +203,7 @@ clickAndWait - //h3[@id='organizationForPosition']/a/img + css=a.add-relatedBy > img.add-individual @@ -238,7 +248,7 @@ clickAndWait - //h3[@id='organizationForPosition']/a/img + css=a.add-relatedBy > img.add-individual @@ -284,7 +294,7 @@ verifyTextPresent - Furter, Frank, Dr. 2010 - + Furter, Frank , Dr. 2010 - @@ -394,6 +404,11 @@ Child Development + + verifyElementPresent + id=organizationMoniker + + verifyTextPresent How do you want to compare? @@ -426,7 +441,7 @@ verifyTextPresent - Zink, Zoe + Johnson, Jane @@ -446,7 +461,7 @@ verifyTextPresent - Johnson, Jane + Zink, Zoe @@ -456,7 +471,7 @@ verifyTextPresent - Comparing Publications of People in Child Development + Comparing publications of People in Child Development @@ -511,12 +526,22 @@ verifyTextPresent - Year + 2011 verifyTextPresent - Total Number of Publications + 2012 + + + + verifyTextPresent + Total Number of publications + + + + verifyTextPresent + You have selected 3 of a maximum 10 people. @@ -526,12 +551,12 @@ verifyElementPresent - link=Smith, Sally + link=Johnson, Jane verifyElementPresent - link=Johnson, Jane + link=Smith, Sally @@ -636,11 +661,6 @@ What do you want to compare? - - verifyTextPresent - Records 1 - 4 of 4 - - verifyTextPresent Furter, Frank @@ -688,7 +708,7 @@ verifyTextPresent - Comparing Grants of People in Child Development + Comparing grants of People in Child Development @@ -738,12 +758,17 @@ verifyTextPresent - Year + 2011 verifyTextPresent - Total Number of Grants + 2012 + + + + verifyTextPresent + Total Number of grants @@ -817,9 +842,14 @@ College of Human Ecology + + click + //div[@id='wrapper-content']/ul/li[14] + + clickAndWait - //h3[@id='hasSubOrganization']/a/img + css=a.add-BFO_0000051 > img.add-individual @@ -919,6 +949,11 @@ College of Human Ecology - Temporal Graph Visualization + + verifyElementPresent + id=organizationMoniker + + verifyTextPresent College of Human Ecology @@ -951,7 +986,7 @@ verifyTextPresent - Comparing Publications of Organizations in College of Human Ecology + Comparing publications of Organizations in College of Human Ecology @@ -1011,12 +1046,12 @@ verifyTextPresent - Year + 2012 verifyTextPresent - Total Number of Publications + Total Number of publications @@ -1116,6 +1151,11 @@ College of Human Ecology + + verifyElementPresent + id=organizationMoniker + + select //div[@id='leftUpper']/div/select @@ -1163,7 +1203,7 @@ verifyTextPresent - Comparing Grants of Organizations in College of Human Ecology + Comparing grants of Organizations in College of Human Ecology @@ -1218,12 +1258,12 @@ verifyTextPresent - Year + 2012 verifyTextPresent - Total Number of Grants + Total Number of grants diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index 50aa6a82..b1435405 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -458,7 +458,7 @@ clickAndWait - xpath=(//img[@alt='add'])[21] + xpath=(//img[@alt='add'])[22] @@ -466,11 +466,6 @@ Edit - - - - - select id=selector @@ -563,47 +558,7 @@ clickAndWait - //h3[@id='adviseeIn']/a/img - - - - clickAndWait - id=offerCreate - - - - assertTitle - Edit - - - - type - name - Primates Foundation of America - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - xpath=(//img[@alt='add'])[29] - - - - assertTitle - Edit - - - - clickAndWait - //h3[@id='awardOrHonor']/a/img + xpath=(//img[@alt='add'])[30] @@ -733,7 +688,7 @@ clickAndWait - xpath=(//h3[@id='ARG_2000028']/a)[2] + xpath=(//img[@alt='add'])[33] @@ -743,7 +698,7 @@ type - id=streetAddress + id=streetAddressOne The Jungle @@ -916,11 +871,6 @@ Faculty, Jane - - assertTitle - Faculty, Jane - - clickAndWait @@ -982,6 +932,21 @@ css=a.add-eligibleFor > img.add-individual + + select + id=typeOfNew + label=Credential (vivo) + + + clickAndWait + id=offerCreate + + + + assertTitle + Edit + + type name @@ -1237,7 +1202,7 @@ verifyTextPresent - Librarian, Lily Lou Assistant Librarian + Librarian, Lily Lou  Assistant Librarian @@ -1358,8 +1323,8 @@ - verifyTextPresent - 1234 + verifyElementPresent + link=exact:file:///C:/xampp/1234 @@ -1393,15 +1358,130 @@ Apes - + - verifyTextPresent - Foundation + click + //div[@id='wrapper-content']/ul/li[20] verifyElementPresent - link=Primates Foundation of America + link=Librarian, Lily Lou + + + + verifyTextPresent + Librarian, Lily Lou  Assistant Librarian + + + + verifyTextPresent + I study monkeys, of course. + + + + verifyElementPresent + link=Africa + + + + verifyTextPresent + I teach monkeys to communicate. + + + + verifyTextPresent + postdoc or fellow advising relationship + + + + verifyElementPresent + link=Smith, Joe + + + + verifyTextPresent + I travel the country teaching monkeys in zoos how to communicate. + + + + verifyElementPresent + link=Primate Expert Association + + + + verifyElementPresent + link=Licensed Primate Expert + + + + verifyElementPresent + link=Monkey Trainer of the Year + + + + verifyTextPresent + Ms. Jane Elizabeth Faculty, III + + + + verifyTextPresent + 607-244-4444 + + + + verifyTextPresent + The Jungle + + + + verifyTextPresent + Congo City + + + + verifyTextPresent + Congola State + + + + verifyTextPresent + 1234567890 + + + + verifyTextPresent + Democratic Republic of Congo + + + + verifyElementPresent + link=exact:file:///C:/xampp/1234 + + + + verifyTextPresent + ABC123987 + + + + verifyTextPresent + 123456789 + + + + verifyElementPresent + link=5678 + + + + verifyElementPresent + link=USABC123456789 + + + + verifyTextPresent + Apes diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html index 1c34381c..88f80447 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html @@ -153,6 +153,21 @@ + + clickAndWait + link=Home + + + + assertTitle + VIVO + + + + pause + 10000 + + verifyTextPresent No research content found. @@ -164,11 +179,6 @@ - - clickAndWait - link=Home - - clickAndWait link=Log out diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html index 32cbf7e7..f935554b 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html @@ -241,6 +241,16 @@ + + clickAndWait + link=Home + + + + assertTitle + VIVO + + verifyTextPresent No research content found. @@ -271,6 +281,11 @@ link=Person (2) + + pause + 10000 + + verifyElementPresent link=Faculty, Jane diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 3fc916cf..844e2c92 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -101,6 +101,11 @@ Edit + + click + link=Remove + + click id=showAddFormButton @@ -126,21 +131,6 @@ id=submit - - assertTitle - Edit - - - - click - link=Remove - - - - assertConfirmation - Are you sure you want to remove this term? - - clickAndWait link=Return to Profile Page diff --git a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html index 830d69b2..8483ccc1 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html +++ b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html @@ -21,7 +21,7 @@ 500000 - + open /vivo/ diff --git a/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html b/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html index 3257eebe..ada75c77 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html +++ b/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html @@ -21,7 +21,7 @@ 100000 - + open /vivo/ @@ -69,11 +69,6 @@ VIVO Site Administration - - selectWindow - null - - clickAndWait link=User accounts @@ -85,14 +80,9 @@ - clickAndWait - link=JaneFaculty@cornell.edu - - - - assertTitle - VIVO - + type + id=externalAuthId + JaneFaculty@cornell.edu type diff --git a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html index 408906f1..1b5b3afd 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html @@ -21,7 +21,7 @@ 10000000 - + open /vivo/ diff --git a/utilities/acceptance-tests/suites/SelfEditing/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/SelfEditing/DeleteFacultyInfo.html index a5083822..0f4cfe42 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/SelfEditing/DeleteFacultyInfo.html @@ -21,7 +21,7 @@ 200000 - + open /vivo/ diff --git a/utilities/acceptance-tests/suites/SelfEditing/DeleteNewSelfEditorUser.html b/utilities/acceptance-tests/suites/SelfEditing/DeleteNewSelfEditorUser.html index 85ac3836..27fe4396 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/DeleteNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/SelfEditing/DeleteNewSelfEditorUser.html @@ -21,7 +21,7 @@ 100000 - + open /vivo/