diff --git a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html new file mode 100644 index 00000000..60524519 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html @@ -0,0 +1,219 @@ + + + + + + +CreateTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CreateTestFacultyMember
commentAdd test Faculty member named Jane Faculty
deleteAllVisibleCookies
setTimeout10000000
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as the site admin
typeloginNametestAdmin@cornell.edu
typeloginPasswordPassword
clickAndWaitloginForm
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
verifyTextPresentData Input
selectVClassURIlabel=Faculty Member (vivo)
clickAndWait//input[@value='Add individual of this class']
assertTitleEdit
commentAdd Jane Faculty
typefirstNameJane
typelastNameFaculty
clickAndWaitsubmit
commentEdit Jane Faculty to add title
assertTitleFaculty, Jane
assertTextPresentFaculty Member
clickAndWaitcss=a.add-preferredTitle > img.add-individual
assertTitleEdit
verifyTextPresentAdd new entry for: preferred title
waitForElementPresenttinymce
typetinymceAssistant Professor
clickAndWaitsubmit
assertTitleFaculty, Jane
assertTextPresentAssistant Professor
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html new file mode 100644 index 00000000..f353ca01 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html @@ -0,0 +1,299 @@ + + + + + + +CreateTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CreateTestFacultyMember
commentCreate test departments
deleteAllVisibleCookies
setTimeout10000000
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as the site admin
typeloginNametestAdmin@cornell.edu
typeloginPasswordPassword
clickAndWaitloginForm
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
commentAdd "Department A" with a geographic location
selectid=VClassURIlabel=Academic Department (vivo)
clickAndWaitid=submit
assertTitleEdit
typeid=labelDepartment A
clickAndWaitid=submit
assertTitleDepartment A
clickAndWaitcss=a.add-hasGeographicLocation > img.add-individual
assertTitleEdit
clickAndWaitid=offerCreate
assertTitleEdit
typeid=nameBuilding A
clickAndWaitid=submit
assertTitleDepartment A
commentAdd "Department B" without a geographic location
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
selectid=VClassURIlabel=Academic Department (vivo)
clickAndWaitid=submit
assertTitleEdit
typeid=labelDepartment B
clickAndWaitid=submit
assertTitleDepartment B
commentVerify index
clickAndWaitlink=Index
assertTitleIndex of Contents
clickAndWaitlink=Academic Department
assertTitleAcademic Department
verifyElementPresentlink=Department A
verifyElementPresentlink=Department B
clickAndWaitlink=Index
assertTitleIndex of Contents
clickAndWaitlink=Building
assertTitleBuilding
verifyElementPresentlink=Building A
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html new file mode 100644 index 00000000..3a5c8a31 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html @@ -0,0 +1,669 @@ + + + + + + +CreateTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CreateTestFacultyMember
commentAdd five test people
deleteAllVisibleCookies
setTimeout10000000
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as the site admin
typeloginNametestAdmin@cornell.edu
typeloginPasswordPassword
clickAndWaitloginForm
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
commentAdd faculty Able Baker with a preferred title
selectid=VClassURIlabel=Faculty Member (vivo)
clickAndWaitid=submit
assertTitleEdit
typeid=firstNameAble
typeid=lastNameBaker
clickAndWaitid=submit
assertTitleBaker, Able
clickAndWaitcss=a.add-preferredTitle > img.add-individual
assertTitleEdit
typetinymceProfessor
clickAndWaitid=submit
assertTitleBaker, Able
commentAdd faculty Charlie Dog as a member of Department A
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
selectid=VClassURIlabel=Faculty Member (vivo)
clickAndWaitid=submit
typeid=firstNameCharlie
typeid=lastNameDog
clickAndWaitid=submit
assertTitleDog, Charlie
clickAndWaitcss=a.add-hasMemberRole > img.add-individual
assertTitleEdit
selectid=typeSelectorlabel=Academic Department
typeid=activityDepart
clickid=ui-active-menuitem
typeid=roleLabelMember
clickAndWaitid=submit
assertTitleDog, Charlie
commentAdd faculty Echo Foxtrot as the head of Department B
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
selectid=VClassURIlabel=Faculty Member (vivo)
clickAndWaitid=submit
typeid=firstNameEcho
typeid=lastNameFoxtrot
clickAndWaitid=submit
assertTitleFoxtrot, Echo
clickAndWaitcss=a.add-hasLeaderRole > img.add-individual
assertTitleEdit
selectid=typeSelectorlabel=Department
typeid=activityDepart
clickid=ui-active-menuitem
typeid=roleLabelHead
clickAndWaitid=submit
assertTitleFoxtrot, Echo
commentAdd faculty George Henry
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
selectid=VClassURIlabel=Faculty Member (vivo)
clickAndWaitid=submit
typeid=firstNameGeorge
typeid=lastNameHenry
clickAndWaitid=submit
assertTitleHenry, George
commentAdd person Iris Jenkins
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
selectid=VClassURIlabel=Person (foaf)
clickAndWaitid=submit
assertTitleEdit
typeid=firstNameIris
typeid=lastNameJenkins
clickAndWaitid=submit
assertTitleJenkins, Iris
commentVerify all people exist
clickAndWaitlink=Index
assertTitleIndex of Contents
verifyTextPresentFaculty Member (4)
verifyTextPresentPerson (5)
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
verifyTextPresentFaculty Member
verifyElementPresentlink=Baker, Able
verifyElementPresentlink=Dog, Charlie
verifyElementPresentlink=Foxtrot, Echo
verifyElementPresentlink=Henry, George
clickAndWaitlink=Index
assertTitleIndex of Contents
clickAndWaitlink=Person
assertTitlePerson
verifyTextPresentPerson
verifyElementPresentlink=Jenkins, Iris
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Foxtrot, Echo
assertTitleFoxtrot, Echo
clickAndWaitlink=Index
assertTitleIndex of Contents
clickAndWaitlink=Department
assertTitleDepartment
assertTitleIndex of Contents
clickAndWaitlink=Academic Department
assertTitleAcademic Department
assertTitleIndex of Contents
clickAndWaitlink=Organization
assertTitleOrganization
assertTitleIndex of Contents
clickAndWaitlink=Building
assertTitleBuilding
assertTitleIndex of Contents
assertTitlephpMyAdmin 3.4.5 - localhost
selectFrameframe_navigation
clickAndWaitlink=vivo
selectWindowname=frame_content
clicklink=Check All
selectAndWaitname=submit_multlabel=Drop
clickAndWaitid=buttonYes
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html b/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html new file mode 100644 index 00000000..50ef13b0 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html @@ -0,0 +1,244 @@ + + + + + + +DeleteTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DeleteTestFacultyMember
commentDelete test person Jane Faculty
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust not be logged in
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust log in as site admin
typeloginNametestAdmin@cornell.edu
typeloginPasswordPassword
clickAndWaitloginForm
commentNavigate to Jane Faculty
clickAndWaitlink=Index
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
clickAndWaitlink=Edit this individual
commentDelete Jane Faculty
clickAndWait//input[@value="Edit This Individual"]
assertTitleIndividual Editing Form
clickAndWait_delete
assertConfirmationAre you SURE you want to delete this individual? If in doubt, CANCEL.
waitForPageToLoad10000
assertTitleVIVO Site Administration
commentVerify that Jane Faculty is indeed gone
clickAndWaitlink=Index
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
verifyTextNotPresentFaculty Member
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html b/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html new file mode 100644 index 00000000..50ef13b0 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html @@ -0,0 +1,244 @@ + + + + + + +DeleteTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DeleteTestFacultyMember
commentDelete test person Jane Faculty
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust not be logged in
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust log in as site admin
typeloginNametestAdmin@cornell.edu
typeloginPasswordPassword
clickAndWaitloginForm
commentNavigate to Jane Faculty
clickAndWaitlink=Index
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Faculty, Jane
assertTitleFaculty, Jane
clickAndWaitlink=Edit this individual
commentDelete Jane Faculty
clickAndWait//input[@value="Edit This Individual"]
assertTitleIndividual Editing Form
clickAndWait_delete
assertConfirmationAre you SURE you want to delete this individual? If in doubt, CANCEL.
waitForPageToLoad10000
assertTitleVIVO Site Administration
commentVerify that Jane Faculty is indeed gone
clickAndWaitlink=Index
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
verifyTextNotPresentFaculty Member
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/ShortViews/RebuildSearchIndex.html b/utilities/acceptance-tests/suites/ShortViews/RebuildSearchIndex.html new file mode 100644 index 00000000..da323202 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/RebuildSearchIndex.html @@ -0,0 +1,129 @@ + + + + + + +RebuildSearchIndex + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
RebuildSearchIndex
commentRebuild Search Index
deleteAllVisibleCookies
setTimeout100000000000
open/vivo/
assertTitleVIVO
clickAndWaitlink=Log in
assertTitleLog in to VIVO
typeid=loginNametestAdmin@cornell.edu
typeid=loginPasswordPassword
clickAndWaitname=loginForm
assertTitleVIVO
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
clickAndWaitlink=Rebuild search index
assertTitleRebuild Search Index
clickAndWaitname=rebuild
assertTitleRebuild Search Index
waitForTextPresentReset the search index and re-populate it.
clickAndWaitlink=Log out
+ + diff --git a/utilities/acceptance-tests/suites/ShortViews/Suite.html b/utilities/acceptance-tests/suites/ShortViews/Suite.html new file mode 100644 index 00000000..dd02732b --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/Suite.html @@ -0,0 +1,19 @@ + + + + + + Test Suite + + + + + + + + + + +
Test Suite
RebuildSearchIndex
CreateTestDepartments
CreateTestPeople
CheckResults
DeleteTestPeople
DeleteTestDepartments
+ + diff --git a/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 b/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 new file mode 100644 index 00000000..b21cb8fc --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 @@ -0,0 +1,122 @@ +# $This file is distributed under the terms of the license in /doc/license.txt$ + +# +# Short View configuration +# +# This file allows a Vitro administrator to configure short view templates and data getters +# for individuals of particular classes in particular contexts. This is a transitional +# implementation, and should be replaced when the work on the Application and Display +# Ontology is complete. +# +# Find out how to use this file at +# https://sourceforge.net/apps/mediawiki/vivo/index.php?title=Using_Short_Views_in_Release_1.5 +# + +@prefix vivo: . +@prefix display: . +@prefix datagetters: . +@prefix mydomain: . + +# +# In all views, Facult Members should show the name of the +# department they belong to. +# + +vivo:FacultyMember + display:hasCustomView mydomain:facultySearchView ; + display:hasCustomView mydomain:facultyIndexView ; + display:hasCustomView mydomain:facultyBrowseView . + +mydomain:facultySearchView + a display:customViewForIndividual ; + display:appliesToContext "SEARCH" ; + display:hasTemplate "view-search-faculty.ftl" ; + display:hasDataGetter mydomain:facultyDepartmentDG . + +mydomain:facultyIndexView + a display:customViewForIndividual ; + display:appliesToContext "INDEX" ; + display:hasTemplate "view-index-faculty.ftl" ; + display:hasDataGetter mydomain:facultyDepartmentDG . + +mydomain:facultyBrowseView + a display:customViewForIndividual ; + display:appliesToContext "BROWSE" ; + display:hasTemplate "view-browse-faculty.ftl" ; + display:hasDataGetter mydomain:facultyDepartmentDG ; + display:hasDataGetter mydomain:facultyPreferredTitleDG . + +mydomain:facultyDepartmentDG + a datagetters:SparqlQueryDataGetter ; + display:saveToVar "details" ; + display:query """ +PREFIX rdfs: +PREFIX vivo: +SELECT ?deptName +WHERE { +?individualUri vivo:hasMemberRole ?membership . +?membership vivo:roleContributesTo ?deptUri . +?deptUri + a vivo:AcademicDepartment ; + rdfs:label ?deptName . +} +LIMIT 20 + """ . + +mydomain:facultyPreferredTitleDG + a datagetters:SparqlQueryDataGetter ; + display:saveToVar "extra" ; + display:query """ +PREFIX rdfs: +PREFIX vivo: +SELECT ?pt +WHERE { +?individualUri ?pt +} +LIMIT 1 + """ . + +# +# In the INDEX view, Academic departments should show locations +# and department head. +# + +vivo:AcademicDepartment + display:hasCustomView mydomain:departmentView . + +mydomain:departmentView + a display:customViewForIndividual ; + display:appliesToContext "INDEX" ; + display:hasTemplate "view-index-department.ftl" ; + display:hasDataGetter mydomain:departmentLocationDG ; + display:hasDataGetter mydomain:departmentHeadDG . + +mydomain:departmentLocationDG + a datagetters:SparqlQueryDataGetter ; + display:saveToVar "locations" ; + display:query """ +PREFIX rdfs: +PREFIX vivo: +SELECT ?label +WHERE +{ +?location vivo:geographicLocationOf ?individualUri ; + rdfs:label ?label . +} +LIMIT 20 + """ . + +mydomain:departmentHeadDG + a datagetters:SparqlQueryDataGetter ; + display:saveToVar "deptHead" ; + display:query """ +PREFIX rdfs: +PREFIX vivo: +SELECT ?label +WHERE +{ +?individualUri vivo:currentlyHeadedBy ?head . +?head rdfs:label ?label . +} +LIMIT 1 + """ . diff --git a/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl b/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl new file mode 100644 index 00000000..5446c929 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl @@ -0,0 +1,40 @@ +<#-- Default individual browse view --> + +<#import "lib-properties.ftl" as p> + +
  • + +<#if (individual.thumbUrl)??> + ${individual.name} +

    + ${individual.name} +

    +<#else> +

    + ${individual.name} +

    + + +<#if (extra[0].pt)?? > + ${extra[0].pt} +<#else> + <#assign cleanTypes = 'edu.cornell.mannlib.vitro.webapp.web.TemplateUtils$DropFromSequence'?new()(individual.mostSpecificTypes, vclass) /> + <#if cleanTypes?size == 1> + ${cleanTypes[0]} + <#elseif (cleanTypes?size > 1) > + +
      + <#list cleanTypes as type> +
    • ${type}
      • + +
    +     + + + +<#if (details[0].deptName)?? > + Member of ${details[0].deptName} + + +
    • + diff --git a/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl b/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl new file mode 100644 index 00000000..58cccbc0 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl @@ -0,0 +1,18 @@ +<#import "lib-vivo-properties.ftl" as p> + +${individual.name} + +<@p.displayTitle individual /> + +<#if locations??> + <#list locations as location> + <#if (location.label)?? > + Not valid in ${location.label} + + + + +<#if (deptHead[0].label)?? > + Headed by ${deptHead[0].label} + + diff --git a/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl b/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl new file mode 100644 index 00000000..3960f580 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl @@ -0,0 +1,10 @@ +<#import "lib-vivo-properties.ftl" as p> + +${individual.name} + +<@p.displayTitle individual /> + +<#if (details[0].deptName)?? > + Member of ${details[0].deptName} + + diff --git a/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl b/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl new file mode 100644 index 00000000..99b9eb84 --- /dev/null +++ b/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl @@ -0,0 +1,12 @@ +<#import "lib-vivo-properties.ftl" as p> + +${individual.name} + +<@p.displayTitle individual /> + +<#if (details[0].deptName)?? > + Member of ${details[0].deptName} + + +

    ${individual.snippet}

    +