diff --git a/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html b/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html
deleted file mode 100644
index 0c2795c2..00000000
--- a/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html
+++ /dev/null
@@ -1,329 +0,0 @@
-
-
-
-
-
-
-AddCollectionTabs
-
-
-
-
-
-AddCollectionTabs
-
-
- deleteAllVisibleCookies
-
-
-
-
- comment
-
-
-
-
- open
- /vivo/
-
-
-
- assertTitle
- VIVO
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Log in
-
-
-
- assertTitle
- VIVO
-
-
-
- comment
-
-
-
-
- type
- loginName
- testAdmin
-
-
- type
- loginPassword
- Password
-
-
- clickAndWait
- loginForm
-
-
-
- assertTitle
- VIVO Site Administration
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Tab management
-
-
-
- assertTitle
- Tabs
-
-
-
- comment
-
-
-
-
- verifyTextNotPresent
- Librarians
-
-
-
- verifyTextNotPresent
- Research Associates
-
-
-
- clickAndWait
- //input[@value='Add new tab']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- comment
-
-
-
-
- type
- Title
- Librarians
-
-
- select
- TabtypeId
- label=collection
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- comment
-
-
-
-
- verifyTextPresent
- Librarians
-
-
-
- verifyTextPresent
- collection
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- //input[@value='Add existing tab as parent tab']
-
-
-
- comment
-
-
-
-
- select
- ParentId
- label=Faculty
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- //input[@value='Add New Tab']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- comment
-
-
-
-
- type
- Title
- Research Associates
-
-
- select
- TabtypeId
- label=collection
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- verifyTextPresent
- Research Associates
-
-
-
- verifyTextPresent
- collection
-
-
-
- clickAndWait
- //input[@value='Add existing tab as parent tab']
-
-
-
- assertTitle
- Super/Subtab Editing Form
-
-
-
- comment
-
-
-
-
- select
- ParentId
- label=Faculty
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- link=People
-
-
-
- assertTitle
- People
-
-
-
- verifyTextPresent
- Faculty
-
-
-
- comment
-
-
-
-
- verifyTextPresent
- Research Associates
-
-
-
- verifyTextPresent
- Librarians
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Home
-
-
-
- clickAndWait
- link=Log out
-
-
-
- assertTitle
- VIVO
-
-
-
-
-
diff --git a/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.html b/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.html
deleted file mode 100644
index f9df5bd4..00000000
--- a/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.html
+++ /dev/null
@@ -1,259 +0,0 @@
-
-
-
-
-
-
-AddPrimaryTabs
-
-
-
-
-
-AddPrimaryTabs
-
-
- deleteAllVisibleCookies
-
-
-
-
- comment
-
-
-
-
- open
- /vivo/
-
-
-
- assertTitle
- VIVO
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Log in
-
-
-
- assertTitle
- VIVO
-
-
-
- comment
-
-
-
-
- type
- loginName
- testAdmin
-
-
- type
- loginPassword
- Password
-
-
- clickAndWait
- loginForm
-
-
-
- assertTitle
- VIVO Site Administration
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Tab management
-
-
-
- assertTitle
- Tabs
-
-
-
- clickAndWait
- //input[@value='Add new tab']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- comment
-
-
-
-
- type
- Title
- People2
-
-
- select
- TabtypeId
- label=primary tab
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- comment
-
-
-
-
- verifyTextPresent
- People2
-
-
-
- verifyTextPresent
- primary tab
-
-
-
- clickAndWait
- //input[@value='Add New Tab']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- comment
-
-
-
-
- type
- Title
- Academic Units
-
-
- select
- TabtypeId
- label=primary tab
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- comment
-
-
-
-
- verifyTextPresent
- Academic Units
-
-
-
- verifyTextPresent
- primary tab
-
-
-
- clickAndWait
- //input[@value='See All Tabs']
-
-
-
- assertTitle
- Tabs
-
-
-
- comment
-
-
-
-
- verifyTextPresent
- Home
-
-
-
- verifyTextPresent
- People2
-
-
-
- verifyTextPresent
- Academic Units
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Home
-
-
-
- clickAndWait
- link=Log out
-
-
-
- assertTitle
- VIVO
-
-
-
-
-
diff --git a/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.html b/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.html
deleted file mode 100644
index 8b5adfc7..00000000
--- a/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.html
+++ /dev/null
@@ -1,334 +0,0 @@
-
-
-
-
-
-
-AddSecondaryTabs
-
-
-
-
-
-AddSecondaryTabs
-
-
- deleteAllVisibleCookies
-
-
-
-
- comment
-
-
-
-
- open
- /vivo/
-
-
-
- assertTitle
- VIVO
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Log in
-
-
-
- assertTitle
- VIVO
-
-
-
- comment
-
-
-
-
- type
- loginName
- testAdmin
-
-
- type
- loginPassword
- Password
-
-
- clickAndWait
- loginForm
-
-
-
- assertTitle
- VIVO Site Administration
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Tab management
-
-
-
- assertTitle
- Tabs
-
-
-
- verifyTextPresent
- People2
-
-
-
- comment
-
-
-
-
- verifyTextNotPresent
- Faculty
-
-
-
- verifyTextNotPresent
- Academic Staff
-
-
-
- clickAndWait
- //input[@value='Add new tab']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- comment
-
-
-
-
- type
- Title
- Faculty
-
-
- select
- TabtypeId
- label=secondary tab
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- comment
-
-
-
-
- verifyTextPresent
- Faculty
-
-
-
- verifyTextPresent
- secondary tab
-
-
-
- clickAndWait
- //input[@value='Add existing tab as parent tab']
-
-
-
- assertTitle
- Super/Subtab Editing Form
-
-
-
- comment
-
-
-
-
- select
- ParentId
- label=People2
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- //input[@value='Add New Tab']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- comment
-
-
-
-
- type
- Title
- Academic Staff
-
-
- select
- TabtypeId
- label=secondary tab
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- comment
-
-
-
-
- verifyTextPresent
- Academic Staff
-
-
-
- verifyTextPresent
- secondary tab
-
-
-
- clickAndWait
- //input[@value='Add existing tab as parent tab']
-
-
-
- assertTitle
- Super/Subtab Editing Form
-
-
-
- comment
-
-
-
-
- select
- ParentId
- label=People2
-
-
- clickAndWait
- primaryAction
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- link=People2
-
-
-
- assertTitle
- People
-
-
-
- comment
-
-
-
-
- verifyTextPresent
- Academic Staff
-
-
-
- verifyTextPresent
- Faculty
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Home
-
-
-
- clickAndWait
- link=Log out
-
-
-
- assertTitle
- VIVO
-
-
-
-
-
diff --git a/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.html b/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.html
deleted file mode 100644
index 39b011db..00000000
--- a/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.html
+++ /dev/null
@@ -1,449 +0,0 @@
-
-
-
-
-
-
-DeleteNewTabs
-
-
-
-
-
-DeleteNewTabs
-
-
- deleteAllVisibleCookies
-
-
-
-
- comment
-
-
-
-
- open
- /vivo/
-
-
-
- assertTitle
- VIVO
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Log in
-
-
-
- assertTitle
- VIVO
-
-
-
- comment
-
-
-
-
- type
- loginName
- testAdmin
-
-
- type
- loginPassword
- Password
-
-
- clickAndWait
- loginForm
-
-
-
- assertTitle
- VIVO Site Administration
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Tab management
-
-
-
- assertTitle
- Tabs
-
-
-
- verifyTextPresent
- Home
-
-
-
- comment
-
-
-
-
- verifyTextPresent
- Faculty
-
-
-
- verifyTextPresent
- People
-
-
-
- verifyTextPresent
- Librarians
-
-
-
- verifyTextPresent
- Academic Staff
-
-
-
- verifyTextPresent
- Research Associates
-
-
-
- verifyTextPresent
- Academic Units
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Faculty
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- //input[@value='Edit Tab Details']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- click
- _delete
-
-
-
- assertConfirmation
- Are you SURE you want to delete this record? If in doubt, CANCEL.
-
-
-
- waitForPageToLoad
- 5000
-
-
-
- assertTitle
- Tabs
-
-
-
- clickAndWait
- link=Academic Staff
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- //input[@value='Edit Tab Details']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- click
- _delete
-
-
-
- assertConfirmation
- Are you SURE you want to delete this record? If in doubt, CANCEL.
-
-
-
- waitForPageToLoad
- 5000
-
-
-
- assertTitle
- Tabs
-
-
-
- clickAndWait
- //a[contains(@href, './tabEdit?id=983349090&home=1')]
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- //input[@value='Edit Tab Details']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- click
- _delete
-
-
-
- assertConfirmation
- Are you SURE you want to delete this record? If in doubt, CANCEL.
-
-
-
- waitForPageToLoad
- 5000
-
-
-
- assertTitle
- Tabs
-
-
-
- clickAndWait
- link=Librarians
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- //input[@value='Edit Tab Details']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- click
- _delete
-
-
-
- assertConfirmation
- Are you SURE you want to delete this record? If in doubt, CANCEL.
-
-
-
- waitForPageToLoad
- 5000
-
-
-
- assertTitle
- Tabs
-
-
-
- clickAndWait
- link=Research Associates
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- //input[@value='Edit Tab Details']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- click
- _delete
-
-
-
- assertConfirmation
- Are you SURE you want to delete this record? If in doubt, CANCEL.
-
-
-
- waitForPageToLoad
- 5000
-
-
-
- assertTitle
- Tabs
-
-
-
- clickAndWait
- //a[contains(@href, './tabEdit?id=2084405211&home=1')]
-
-
-
- assertTitle
- Tab Control Panel
-
-
-
- clickAndWait
- //input[@value='Edit Tab Details']
-
-
-
- assertTitle
- Tab Editing Form
-
-
-
- click
- _delete
-
-
-
- assertConfirmation
- Are you SURE you want to delete this record? If in doubt, CANCEL.
-
-
-
- waitForPageToLoad
- 5000
-
-
-
- assertTitle
- Tabs
-
-
-
- verifyTextPresent
- Home
-
-
-
- verifyTextNotPresent
- Faculty
-
-
-
- verifyTextNotPresent
- People
-
-
-
- verifyTextNotPresent
- Librarians
-
-
-
- verifyTextNotPresent
- Academic Staff
-
-
-
- verifyTextNotPresent
- Research Associates
-
-
-
- verifyTextNotPresent
- Academic Units
-
-
-
- comment
-
-
-
-
- clickAndWait
- link=Home
-
-
-
- clickAndWait
- link=Log out
-
-
-
- assertTitle
- VIVO
-
-
-
-
-
diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
index 9f54054a..aac1ee63 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
@@ -86,7 +86,7 @@
assertTitle
- VIVO Site Administration
+ VIVO
@@ -95,8 +95,13 @@
- verifyTextPresent
- Site Configuration
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
@@ -119,36 +124,11 @@
AppName
VIVO Test Site
-
- type
- ContactMail
- hlm7@cornell.edu
-
-
- select
- RootTabId
- label=Home
-
type
CopyrightAnchor
VIVO Project 2010
-
- type
- CopyrightURL
- http://vivoweb.org
-
-
- type
- AboutText
- <p>This is a test system for VIVO! <p>The VIVO National Network enables the discovery of researchers across institutions. Participants in the network include institutions with local installations of VIVO or those with research discovery and profiling applications that can provide semantic web-compliant data. The information accessible through VIVO's search and browse capability will therefore reside and be controlled locally, within institutional VIVOs or other semantic web-compliant applications.</p> <p>VIVO is an open source semantic web application originally developed and implemented at Cornell. When installed and populated with content at an institution, it enables the discovery of research and scholarship across disciplines at that institution. VIVO supports browsing and a search function which returns faceted results for rapid retrieval of desired information. Content in any local VIVO installation may be maintained manually or brought into the database in automated ways from local systems of record, such as HR, grants, course, and faculty activity databases.</p> <p>See more information on the <a href="http://vivoweb.org">VIVO Project</a>.</p>
-
-
- type
- AcknowledgeText
- Holly Mistlebauer set this up!
-
clickAndWait
primaryAction
@@ -169,46 +149,21 @@
link=Home
-
- comment
-
-
-
assertTitle
VIVO Test Site
+
+ comment
+
+
+
verifyTextPresent
VIVO Project 2010
-
- clickAndWait
- link=About
-
-
-
- assertTitle
- About VIVO Test Site
-
-
-
- verifyTextPresent
- This is a test system for VIVO!
-
-
-
- verifyElementPresent
- link=VIVO Project
-
-
-
- verifyTextPresent
- Holly Mistlebauer set this up!
-
-
clickAndWait
link=Site Admin
@@ -239,31 +194,11 @@
AppName
VIVO
-
- type
- ContactMail
-
-
type
CopyrightAnchor
VIVO Project
-
- type
- CopyrightURL
-
-
-
- type
- AboutText
- <p>The VIVO National Network enables the discovery of researchers across institutions. Participants in the network include institutions with local installations of VIVO or those with research discovery and profiling applications that can provide semantic web-compliant data. The information accessible through VIVO's search and browse capability will therefore reside and be controlled locally, within institutional VIVOs or other semantic web-compliant applications.</p> <p>VIVO is an open source semantic web application originally developed and implemented at Cornell. When installed and populated with content at an institution, it enables the discovery of research and scholarship across disciplines at that institution. VIVO supports browsing and a search function which returns faceted results for rapid retrieval of desired information. Content in any local VIVO installation may be maintained manually or brought into the database in automated ways from local systems of record, such as HR, grants, course, and faculty activity databases.</p> <p>See more information on the <a href="http://vivoweb.org">VIVO Project</a>.</p>
-
-
- type
- AcknowledgeText
-
-
clickAndWait
primaryAction
@@ -284,44 +219,9 @@
/vivo/
-
- assertTitle
- VIVO
-
-
verifyTextPresent
- VIVO
-
-
-
- verifyTextNotPresent
- VIVO Project 2010
-
-
-
- clickAndWait
- link=About
-
-
-
- assertTitle
- About VIVO
-
-
-
- verifyTextNotPresent
- This is a test system for VIVO!
-
-
-
- verifyElementPresent
- link=VIVO Project
-
-
-
- verifyTextNotPresent
- Holly Mistlebauer set this up!
+ VIVO Project
@@ -344,6 +244,11 @@
VIVO
+
+ verifyTextPresent
+ Log in
+
+