diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
index ad8a93b4..67ccdd63 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
@@ -291,7 +291,7 @@
| verifyTextPresent |
- 3 in the last 10 full |
+ 2 in the last 10 full |
|
@@ -386,7 +386,7 @@
| verifyTextPresent |
- from 2001 to 2012 |
+ from 2001 to 2013 |
|
@@ -401,7 +401,7 @@
| verifyTextPresent |
- from 2001 to 2012 |
+ from 2001 to 2013 |
|
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
index 7759eeac..b34cc783 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
@@ -356,7 +356,7 @@
| verifyTextPresent |
- from 2002 through 2012 |
+ from 2002 through 2013 |
|
@@ -371,7 +371,7 @@
| verifyTextPresent |
- from 2002 through 2012 |
+ from 2002 through 2013 |
|
@@ -567,7 +567,7 @@
| verifyTextPresent |
- from 2001 to 2012 |
+ from 2001 to 2013 |
|
@@ -582,7 +582,7 @@
| verifyTextPresent |
- from 2001 to 2012 |
+ from 2001 to 2013 |
|
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html
index 6ad34060..6cacf90f 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html
@@ -297,7 +297,7 @@
| verifyTextPresent |
- from 2002 through 2012 |
+ from 2002 through 2013 |
|
@@ -312,7 +312,7 @@
| verifyTextPresent |
- from 2003 through 2012 |
+ from 2004 through 2013 |
|
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html
index 3527acdc..bf173417 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html
@@ -792,7 +792,7 @@
| verifyTextPresent |
- 3 in the last 10 full |
+ 2 in the last 10 full |
|
@@ -872,7 +872,7 @@
| verifyTextPresent |
- from 2001 to 2012 |
+ from 2001 to 2013 |
|
@@ -887,7 +887,7 @@
| verifyTextPresent |
- from 2003 to 2012 |
+ from 2004 to 2013 |
|
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
index be46b954..e00e5b4f 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
@@ -801,7 +801,7 @@
| verifyTextPresent |
- from 2003 through 2012 |
+ from 2004 through 2013 |
|
@@ -816,7 +816,7 @@
| verifyTextPresent |
- from 2003 through 2012 |
+ from 2004 through 2013 |
|
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
index d37cddfe..ee215155 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
@@ -489,61 +489,31 @@
| Comparing publications of People in Child Development |
|
-
- | verifyTextPresent |
- 2001 |
- |
-
| verifyTextPresent |
2002 |
|
-
- | verifyTextPresent |
- 2003 |
- |
-
| verifyTextPresent |
2004 |
|
-
- | verifyTextPresent |
- 2005 |
- |
-
| verifyTextPresent |
2006 |
|
-
- | verifyTextPresent |
- 2007 |
- |
-
| verifyTextPresent |
2008 |
|
-
- | verifyTextPresent |
- 2009 |
- |
-
| verifyTextPresent |
2010 |
|
-
- | verifyTextPresent |
- 2011 |
- |
-
| verifyTextPresent |
2012 |
@@ -781,6 +751,11 @@
2012 |
|
+
+ | verifyTextPresent |
+ 2013 |
+ |
+
| verifyTextPresent |
Total Number of grants |
@@ -1009,61 +984,31 @@
Comparing publications of Organizations in College of Human Ecology |
|
-
- | verifyTextPresent |
- 2001 |
- |
-
| verifyTextPresent |
2002 |
|
-
- | verifyTextPresent |
- 2003 |
- |
-
| verifyTextPresent |
2004 |
|
-
- | verifyTextPresent |
- 2005 |
- |
-
| verifyTextPresent |
2006 |
|
-
- | verifyTextPresent |
- 2007 |
- |
-
| verifyTextPresent |
2008 |
|
-
- | verifyTextPresent |
- 2009 |
- |
-
| verifyTextPresent |
2010 |
|
-
- | verifyTextPresent |
- 2011 |
- |
-
| verifyTextPresent |
2012 |
@@ -1281,6 +1226,11 @@
2012 |
|
+
+ | verifyTextPresent |
+ 2013 |
+ |
+
| verifyTextPresent |
Total Number of grants |
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
index 3aa01db7..29792510 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
@@ -103,14 +103,24 @@
Hours |
- | select |
- HiddenFromDisplayBelowRoleLevelUsingRoleUri |
- label=site administrator |
+ selectWindow |
+ null |
+ |
| select |
- ProhibitedFromUpdateBelowRoleLevelUsingRoleUri |
- label=site administrator |
+ name=HiddenFromDisplayBelowRoleLevelUsingRoleUri |
+ label=site admin and root user |
+
+
+ | select |
+ name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri |
+ label=site admin and root user |
+
+
+ | select |
+ name=HiddenFromPublishBelowRoleLevelUsingRoleUri |
+ label=all users, including public |
| select |
@@ -155,7 +165,7 @@
| verifyTextPresent |
- site administrator |
+ site admin and root user |
|
@@ -173,6 +183,11 @@
| http://vivo.mydomain.edu/individual/hours |
|
+
+ | verifyTextPresent |
+ all users, including public |
+ |
+
| clickAndWait |
//input[@value='Show All Classes'] |
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
index 2dc4b72b..3e2ba2c7 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
@@ -104,13 +104,18 @@
| select |
- HiddenFromDisplayBelowRoleLevelUsingRoleUri |
- label=editor, curator, site administrator |
+ name=HiddenFromDisplayBelowRoleLevelUsingRoleUri |
+ label=editor and above |
| select |
- ProhibitedFromUpdateBelowRoleLevelUsingRoleUri |
- label=editor, curator, site administrator |
+ name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri |
+ label=editor and above |
+
+
+ | select |
+ name=HiddenFromPublishBelowRoleLevelUsingRoleUri |
+ label=all users, including public |
| select |
@@ -155,7 +160,7 @@
| verifyTextPresent |
- editor, curator, site administrator |
+ editor and above |
|
@@ -173,6 +178,11 @@
| http://vivo.mydomain.edu/individual/minutes |
|
+
+ | verifyTextPresent |
+ all users, including public |
+ |
+
| clickAndWait |
//input[@value='Show All Classes'] |
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html
index 8864dce4..9a4910b1 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html
@@ -107,21 +107,26 @@
GroupURI |
label=Place |
-
- | select |
- HiddenFromDisplayBelowRoleLevelUsingRoleUri |
- label=editor, curator, site administrator |
-
-
- | select |
- ProhibitedFromUpdateBelowRoleLevelUsingRoleUri |
- label=public |
-
| select |
name=Namespace |
label=VIVO Core |
+
+ | select |
+ name=HiddenFromDisplayBelowRoleLevelUsingRoleUri |
+ label=self-editor and above |
+
+
+ | select |
+ name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri |
+ label=editor and above |
+
+
+ | select |
+ name=HiddenFromPublishBelowRoleLevelUsingRoleUri |
+ label=curator and above |
+
| type |
LocalName |
@@ -173,6 +178,11 @@
architecturalDetails |
|
+
+ | verifyElementPresent |
+ link=Agent (foaf) |
+ |
+
| verifyTextPresent |
http://www.w3.org/2001/XMLSchema#string |
@@ -185,12 +195,12 @@
| verifyTextPresent |
- editor, curator, site administrator |
+ self-editor and above |
|
| verifyTextPresent |
- public |
+ editor and above |
|
@@ -208,6 +218,11 @@
| http://vivoweb.org/ontology/core#architecturalDetails |
|
+
+ | verifyTextPresent |
+ curator and above |
+ |
+
| clickAndWait |
@@ -306,12 +321,12 @@
| verifyTextPresent |
- editor, curator, site administrator |
+ self-editor and above |
|
| verifyTextPresent |
- public |
+ editor and above |
|
@@ -329,6 +344,11 @@
| http://vivoweb.org/ontology/core#architecturalDetails |
|
+
+ | verifyTextPresent |
+ curator and above |
+ |
+
| clickAndWait |
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html
index bf47f792..5816a5ce 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html
@@ -150,12 +150,17 @@
| select |
name=HiddenFromDisplayBelowRoleLevelUsingRoleUri |
- label=editor, curator, site administrator |
+ label=editor and above |
| select |
name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri |
- label=site administrator |
+ label=self-editor and above |
+
+
+ | select |
+ name=HiddenFromPublishBelowRoleLevelUsingRoleUri |
+ label=all users, including public |
| type |
@@ -230,12 +235,12 @@
| verifyTextPresent |
- editor, curator, site administrator |
+ editor and above |
|
| verifyTextPresent |
- site administrator |
+ self-editor and above |
|
@@ -263,6 +268,11 @@
| http://purl.org/ontology/bibo/yearFounded |
|
+
+ | verifyTextPresent |
+ all users, including public |
+ |
+
| clickAndWait |
diff --git a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html
index 80c11c1c..d531f70f 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html
@@ -105,7 +105,7 @@
| select |
name=HiddenFromDisplayBelowRoleLevelUsingRoleUri |
- label=public |
+ label=curator and above |
| clickAndWait |
@@ -120,7 +120,7 @@
| verifyTextPresent |
- public |
+ curator and above |
|
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
index 9f9f0ceb..4288e60e 100644
--- a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
+++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
@@ -91,9 +91,14 @@
//div[@id='wrapper-content']/ul/li[8] |
|
+
+ | selectWindow |
+ null |
+ |
+
| clickAndWait |
- xpath=(//img[@alt='add'])[28] |
+ xpath=(//img[@alt='add'])[29] |
|
@@ -154,7 +159,7 @@
| clickAndWait |
- xpath=(//img[@alt='add'])[28] |
+ xpath=(//img[@alt='add'])[29] |
|
@@ -275,7 +280,7 @@
| clickAndWait |
- xpath=(//img[@alt='add'])[28] |
+ xpath=(//img[@alt='add'])[29] |
|
@@ -357,7 +362,7 @@
| clickAndWait |
- xpath=(//img[@alt='add'])[28] |
+ xpath=(//img[@alt='add'])[29] |
|
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html
index 290b265b..a72aba11 100644
--- a/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html
+++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html
@@ -211,7 +211,7 @@
| clickAndWait |
- xpath=(//img[@alt='edit this entry'])[4] |
+ xpath=(//img[@alt='edit this entry'])[3] |
|
@@ -293,7 +293,7 @@
| clickAndWait |
- xpath=(//img[@alt='edit this entry'])[5] |
+ xpath=(//img[@alt='edit this entry'])[4] |
|
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html
index 1973b830..695eabb6 100644
--- a/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html
+++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html
@@ -65,11 +65,6 @@
| Faculty Member |
|
-
- | verifyTextPresent |
- Faculty, Jane Assistant Professor |
- |
-
| verifyElementPresent |
link=Faculty, Jane |
@@ -122,7 +117,7 @@
| verifyTextPresent |
- Faculty, Jane Assistant Professor |
+ Faculty, Jane Faculty Member |
|
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html
index 850e9433..bb799ab8 100644
--- a/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html
@@ -116,41 +116,6 @@
| Faculty Member |
|
-
- | selectWindow |
- null |
- |
-
-
- | clickAndWait |
- css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual |
- |
-
-
- | assertTitle |
- Edit |
- |
-
-
- | type |
- id=preferredTitle |
- Assistant Professor |
-
-
- | clickAndWait |
- id=submit |
- |
-
-
- | assertTitle |
- Faculty, Jane |
- |
-
-
- | assertTextPresent |
- Assistant Professor |
- |
-
| clickAndWait |
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
index 56866b16..88030d1f 100644
--- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
+++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
@@ -420,11 +420,6 @@
Award or Honor |
|
-
- | selectWindow |
- null |
- |
-
| verifyElementPresent |
link=Best Professor (Faculty, Jane - 2012) |
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
index 48af6488..ce8cc7b4 100644
--- a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
+++ b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
@@ -211,7 +211,7 @@
| clickAndWait |
- xpath=(//img[@alt='edit this entry'])[4] |
+ xpath=(//img[@alt='edit this entry'])[5] |
|
@@ -293,7 +293,7 @@
| clickAndWait |
- css=a.edit-relatedBy > img.edit-individual |
+ xpath=(//img[@alt='edit this entry'])[5] |
|
diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
index 836c9d5d..612c1500 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
@@ -130,7 +130,7 @@
| verifyTextPresent |
- ©2013 VIVO Project |
+ ©2014 VIVO Project |
|
@@ -283,7 +283,7 @@
| verifyTextPresent |
- ©2013 VIVO Project |
+ ©2014 VIVO Project |
|
@@ -303,12 +303,12 @@
| verifyTextPresent |
- Version rel-1.6-rc5 |
+ Version rel-1.6.1-rc2 |
|
| verifyElementPresent |
- link=rel-1.6-rc5 |
+ link=rel-1.6.1-rc2 |
|
@@ -507,7 +507,7 @@
| verifyTextPresent |
- ©2013 |
+ ©2014 |
|
@@ -532,7 +532,7 @@
| verifyTextPresent |
- Version rel-1.6-rc5 |
+ Version rel-1.6.1-rc2 |
|
@@ -619,7 +619,7 @@
| verifyTextPresent |
- ©2013 VIVO Project |
+ ©2014 VIVO Project |
|
@@ -639,12 +639,12 @@
| verifyTextPresent |
- Version rel-1.6-rc |
+ Version rel-1.6.1-rc2 |
|
| verifyElementPresent |
- link=rel-1.6-rc5 |
+ link=rel-1.6.1-rc2 |
|
diff --git a/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3 b/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3
new file mode 100644
index 00000000..3a7631a8
--- /dev/null
+++ b/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3
@@ -0,0 +1,52 @@
+@prefix foaf: .
+@prefix vcard: .
+@prefix obo: .
+@prefix rdfs: .
+@prefix vitro: .
+@prefix xsd: .
+@prefix owl: .
+@prefix vivo: .
+
+
+ a foaf:Person ,
+ vivo:FacultyMember ,
+ foaf:Agent ,
+ owl:Thing ,
+ obo:BFO_0000002 ,
+ obo:BFO_0000001 ,
+ obo:BFO_0000004 ;
+ rdfs:label "Furter, Frank "^^xsd:string ;
+ rdfs:label "Test Label 1 "^^xsd:string ;
+ rdfs:label "Test Label 2 "^^xsd:string ;
+ obo:ARG_2000028 ;
+ vitro:mostSpecificType vivo:FacultyMember .
+
+
+ a obo:BFO_0000031 ,
+ vcard:Kind ,
+ obo:ARG_2000379 ,
+ owl:Thing ,
+ obo:IAO_0000030 ,
+ obo:BFO_0000002 ,
+ obo:BFO_0000001 ,
+ vcard:Individual ;
+ obo:ARG_2000029 ;
+ vitro:mostSpecificType vcard:Individual ;
+ vcard:hasName .
+
+
+ a vcard:Name ,
+ vcard:Geographical ,
+ vcard:TimeZone ,
+ owl:Thing ,
+ vcard:Organizational ,
+ vcard:Geo ,
+ vcard:Communication ,
+ vcard:Explanatory ,
+ vcard:Identification ,
+ vcard:Security ,
+ vcard:Addressing ,
+ vcard:Calendar ;
+ vitro:mostSpecificType vcard:Name ;
+ vcard:familyName "Furter"^^xsd:string ;
+ vcard:givenName "Frank"^^xsd:string .