diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html index e0a1d5dc..209315b2 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -199,7 +199,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html index 078637b5..b415c37d 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -104,11 +104,6 @@ //input[@value='Add individual of this class'] - - assertTitle - Edit - - verifyTextPresent Create a new Librarian @@ -234,7 +229,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index daaff184..5f7469b1 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -1251,7 +1251,7 @@ verifyTextPresent - Faculty, Jane Dr., 1999 - + Faculty, Jane Dr., 1999 - @@ -1339,7 +1339,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html index 1f074f74..ee16b646 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html @@ -56,7 +56,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -81,7 +81,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -111,7 +111,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -134,7 +134,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html index 0939e461..fb085442 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminBookmarkedPage.html @@ -46,7 +46,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -64,7 +64,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html index ed4cced8..ca76949e 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html @@ -55,13 +55,13 @@ - assertTitle - VIVO Site Administration + verifyTextPresent + Log in - verifyTextPresent - Log in + assertTitle + VIVO @@ -89,6 +89,16 @@ VIVO Site Administration + + verifyTextPresent + testAdmin + + + + verifyElementPresent + link=Log out + + verifyTextPresent Site Administration @@ -109,11 +119,6 @@ User Accounts - - verifyTextPresent - testAdmin - - clickAndWait link=testAdmin @@ -231,7 +236,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -251,7 +256,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -261,7 +266,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -354,7 +359,6 @@ Log in - diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html index e2f854f6..5e94dee5 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html @@ -56,7 +56,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -91,7 +91,7 @@ verifyTextPresent - Logged in as testAdmin (Log out) + testAdmin @@ -104,7 +104,6 @@ link=Log out - diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html index 2f495332..4745d24c 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -96,7 +96,7 @@ verifyTextPresent - Email or Username + Email @@ -126,7 +126,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -161,7 +161,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -171,12 +171,7 @@ verifyTextPresent - Create Your New Password - - - - verifyTextPresent - Password + New Password @@ -211,7 +206,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -236,7 +231,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -311,7 +306,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -376,7 +371,7 @@ verifyTextPresent - Logged in as Sis Admin (Log out) + Sis Admin @@ -414,7 +409,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html index b1d5a323..d38ae1f5 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -129,7 +129,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html index c5be234d..20f107e1 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -129,7 +129,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html index e61a84da..e8d3bb36 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -224,7 +224,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html index 9eef9916..66ea8046 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -224,7 +224,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html index 23849038..605528e8 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -179,7 +179,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html index c48e2a9f..9d5d31fe 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -179,7 +179,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html index 0c755e42..fafdd19b 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -116,7 +116,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -126,7 +126,12 @@ verifyTextPresent - Create Your New Password + New Password + + + + verifyTextPresent + Confirm Password @@ -176,7 +181,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -241,7 +246,12 @@ verifyTextPresent - Logged in as Connie Curator (Log out) + Connie Curator + + + + verifyElementPresent + link=Log out @@ -259,7 +269,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html index 22257169..937ab98a 100644 --- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html +++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -86,7 +86,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -116,7 +116,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -126,7 +126,12 @@ verifyTextPresent - Create Your New Password + New Password + + + + verifyTextPresent + Confirm Password @@ -176,7 +181,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -241,7 +246,12 @@ verifyTextPresent - Logged in as Eddie Editor (Log out) + Eddie Editor + + + + verifyElementPresent + link=Log out @@ -259,7 +269,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html index 42dd00c5..a330dbc6 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html +++ b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -169,7 +169,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html index 39b5bc42..32b5cda3 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html +++ b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html @@ -61,7 +61,12 @@ assertTitle - VIVO Site Administration + VIVO + + + + comment + Log in as site admin @@ -249,7 +254,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html index dd221e62..4bdc2f2d 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html +++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -224,7 +224,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html index d0997327..d5b3102b 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html +++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -224,7 +224,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html index 6068ab49..cf1ee62e 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html +++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -179,7 +179,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html index d36cb58a..aa120467 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html +++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -244,7 +244,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html index b32811b3..482473fd 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html +++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -189,7 +189,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html index b4c63bc6..eea105f5 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html +++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -189,7 +189,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html index d3682f59..de227459 100644 --- a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html +++ b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -184,7 +184,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index 36391055..6d813856 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -984,7 +984,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html index e63c21e8..aea82756 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -196,12 +196,37 @@ type - search + querytext faculty clickAndWait - submit + link=Search + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 @@ -210,38 +235,18 @@ - refreshAndWait - 10000 + verifyTextPresent + Search results for 'faculty' - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 + verifyElementPresent + link=Faculty, Jane verifyTextPresent - Faculty, Jane - - - - verifyTextPresent - Assistant Professor + Faculty, Jane | Assistant Professor @@ -259,7 +264,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html index 5f9050de..3e3c290a 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -104,11 +104,6 @@ //input[@value='Add individual of this class'] - - assertTitle - Edit - - verifyTextPresent Create a new Librarian @@ -219,6 +214,16 @@ Librarian + + verifyElementPresent + link=Librarian, Lily + + + + verifyTextPresent + Assistant Librarian + + comment Take a break for indexing @@ -236,12 +241,12 @@ type - search + querytext librarian clickAndWait - submit + link=Search @@ -266,7 +271,7 @@ verifyTextPresent - Search Results for 'librarian' + Search results for 'librarian' @@ -294,7 +299,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html index 993eeba5..08e07b7d 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html @@ -66,7 +66,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -249,7 +249,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseum.html b/utilities/acceptance-tests/suites/CreateProperties/AddMuseum.html index 598fadc8..9ac4e2be 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddMuseum.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddMuseum.html @@ -66,7 +66,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -109,11 +109,6 @@ //input[@value='Add individual of this class'] - - assertTitle - Edit - - comment Add Johnson Art Museum @@ -159,7 +154,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html index 37270a83..389ed4a2 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html @@ -66,7 +66,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -184,11 +184,6 @@ //div[@id='architecturalDetails']/a - - assertTitle - Edit - - comment Edit architectural details @@ -234,7 +229,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html index c471fc4c..a76a8aa9 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html @@ -66,7 +66,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -134,26 +134,16 @@ //div[@id='visitingHours']/a - - assertTitle - Edit - - select typeOfNew - label=Time Interval (core) + label=Date/Time Interval (core) clickAndWait //input[@id='submit' and @value='add a new item to this list'] - - assertTitle - Edit - - comment Set hours to 10am-4pm @@ -181,7 +171,7 @@ verifyTextPresent - 10am-4pm | Time Interval + 10am-4pm | Date/Time Interval @@ -199,7 +189,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html index 1cef0380..3b32a459 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -132,7 +132,7 @@ select ParentURI - label=timeIntervalFor (core) + label=dateTimeInterval (core) select @@ -187,7 +187,7 @@ select RangeVClassURI - label=Time Interval (VIVO core) + label=Date/Time Interval (VIVO core) type @@ -221,7 +221,7 @@ verifyElementPresent - link=exact:core:timeIntervalFor + link=exact:core:dateTimeInterval @@ -231,7 +231,7 @@ verifyElementPresent - link=exact:core:Time Interval + link=exact:core:Date/Time Interval @@ -294,7 +294,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html b/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html index 51a1c7f2..1944c079 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -189,7 +189,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html index bd77b3d9..bf102569 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html +++ b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -164,7 +164,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html index 70a13574..c0e476a9 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html @@ -66,7 +66,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -179,7 +179,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html index 419bb7c2..b608470c 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html @@ -66,7 +66,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -239,7 +239,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html index a6722f8b..f62921e6 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html @@ -66,7 +66,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -194,7 +194,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html index c9e620ff..1e6d8916 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html @@ -51,7 +51,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -66,7 +66,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -184,7 +184,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html index ea91350d..50695a39 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -184,7 +184,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html b/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html index 9fbeb4f2..1f3d0971 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html +++ b/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -170,13 +170,13 @@ - clickAndWait - //input[@value='Add existing tab as parent tab'] + assertTitle + Super/Subtab Editing Form - assertTitle - Super/Subtab Editing Form + clickAndWait + //input[@value='Add existing tab as parent tab'] @@ -319,7 +319,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.html b/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.html index 23b638d9..a032679b 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.html +++ b/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -249,7 +249,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.html b/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.html index 32e8bc61..b4ad0e67 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.html +++ b/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -324,7 +324,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.html b/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.html index 85e464ee..bbb93c1a 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.html +++ b/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -231,7 +231,7 @@ clickAndWait - //div[@id='contentwrap']/div/table/tbody/tr[3]/td[2]/a + //a[contains(@href, './tabEdit?id=983349090&home=1')] @@ -351,7 +351,7 @@ clickAndWait - //div[@id='contentwrap']/div/table/tbody/tr[3]/td[2]/a + //a[contains(@href, './tabEdit?id=2084405211&home=1')] @@ -439,7 +439,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditHomeTab.html b/utilities/acceptance-tests/suites/InitialSetup/EditHomeTab.html index 528abc40..4bea36aa 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditHomeTab.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditHomeTab.html @@ -43,7 +43,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -98,7 +98,7 @@ clickAndWait - //div[@id='contentwrap']/div/table/tbody/tr[2]/td[2]/a + //a[contains(@href, './tabEdit?id=1&home=1')] @@ -188,7 +188,7 @@ clickAndWait - //div[@id='contentwrap']/div/table/tbody/tr[2]/td[2]/a + //a[contains(@href, './tabEdit?id=1&home=1')] @@ -261,7 +261,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index 565bfa43..2f37db05 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html @@ -41,12 +41,12 @@ open - /vivo/siteAdmin?home=1&login=block + /vivo/ assertTitle - VIVO Site Administration + VIVO @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -210,13 +210,13 @@ - verifyTextPresent - VIVO Project + open + /vivo/ - open - /vivo/siteAdmin?home=1 + verifyTextPresent + VIVO Project @@ -239,7 +239,6 @@ Log in - diff --git a/utilities/acceptance-tests/suites/InitialSetup/ReorderPrimaryTabs.html b/utilities/acceptance-tests/suites/InitialSetup/ReorderPrimaryTabs.html index 5fffc9f8..c8773db1 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/ReorderPrimaryTabs.html +++ b/utilities/acceptance-tests/suites/InitialSetup/ReorderPrimaryTabs.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -89,6 +89,16 @@ VIVO Site Administration + + clickAndWait + link=Tab management + + + + assertTitle + Tabs + + verifyTextPresent People @@ -101,22 +111,7 @@ clickAndWait - link=People - - - - assertTitle - People - - - - verifyTextPresent - edit tab: People - - - - clickAndWait - //div[@id='contents']/div[2]/a/em + //a[contains(@href, './tabEdit?id=983349090&home=1')] @@ -161,22 +156,27 @@ clickAndWait - link=Academic Units + link=Site Admin assertTitle - Academic Units - - - - verifyTextPresent - Academic Units + VIVO Site Administration clickAndWait - //div[@id='contents']/div[2]/a/em + link=Tab management + + + + assertTitle + Tabs + + + + clickAndWait + //a[contains(@href, './tabEdit?id=2084405211&home=1')] @@ -244,7 +244,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/InitialSetup/Suite.html b/utilities/acceptance-tests/suites/InitialSetup/Suite.html index c63987d5..2523efe7 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/Suite.html +++ b/utilities/acceptance-tests/suites/InitialSetup/Suite.html @@ -1,21 +1,20 @@ - - - - - - Test Suite - - - - - - - - - - - - -
Test Suite
TestThemes
EditSiteInfo
EditHomeTab
AddPrimaryTabs
ReorderPrimaryTabs
AddSecondaryTabs
AddCollectionTabs
DeleteNewTabs
- - + + + + + + Test Suite + + + + + + + + + + + +
Test Suite
EditSiteInfo
EditHomeTab
AddPrimaryTabs
ReorderPrimaryTabs
AddSecondaryTabs
AddCollectionTabs
DeleteNewTabs
+ + diff --git a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html index c3691fd0..4779ba79 100644 --- a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html +++ b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html @@ -34,6 +34,11 @@ Add SWRC ontology + + deleteAllVisibleCookies + + + open /vivo/ @@ -56,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -199,7 +204,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html b/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html index aafb22bd..b42071f3 100644 --- a/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html +++ b/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html @@ -56,7 +56,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -179,7 +179,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFInternetFile.html b/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFInternetFile.html index 4064a46c..b96b6d93 100644 --- a/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFInternetFile.html +++ b/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFInternetFile.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -141,7 +141,7 @@ verifyTextPresent - Added RDF from http://www.geonames.org/ontology/ontology_v2.0_Lite.rdf. Added 3663 statements. + Added RDF from http://www.geonames.org/ontology/ontology_v2.0_Lite.rdf. @@ -159,7 +159,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFLocalFile.html b/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFLocalFile.html index 0fccde69..84fdec27 100644 --- a/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFLocalFile.html +++ b/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFLocalFile.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -164,7 +164,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFInternetFile.html b/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFInternetFile.html index 7209489c..4900ea66 100644 --- a/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFInternetFile.html +++ b/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFInternetFile.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -141,7 +141,7 @@ verifyTextPresent - Removed RDF from http://www.geonames.org/ontology/ontology_v2.0_Lite.rdf. Removed 2898 statements. + Removed RDF from http://www.geonames.org/ontology/ontology_v2.0_Lite.rdf. @@ -159,7 +159,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFLocalFile.html b/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFLocalFile.html index e826e15b..d57f9d39 100644 --- a/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFLocalFile.html +++ b/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFLocalFile.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -164,7 +164,6 @@ VIVO - diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html b/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html index bd9624a9..3dbf71ee 100644 --- a/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html +++ b/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html @@ -61,7 +61,7 @@ assertTitle - VIVO Site Administration + VIVO @@ -179,7 +179,6 @@ VIVO -