Skip to content

Commit f18863d

Browse files
committed
BroadleafCommerce#1127 Renamed the Root IntegrationSetup files and included a clarifying comment
1 parent b1bd61e commit f18863d

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

integration/src/test/groovy/org/broadleafcommerce/test/AdminIntegrationSetup.groovy renamed to integration/src/test/groovy/org/broadleafcommerce/test/RootAdminIntegrationSetup.groovy

+8-3
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,16 @@ import spock.lang.Specification
4343
@ContextConfiguration(name = "adminContexts",
4444
locations = ["classpath:/bl-open-admin-contentClient-applicationContext.xml",
4545
"classpath:/bl-open-admin-contentCreator-applicationContext.xml",
46-
"classpath:/bl-admin-applicationContext.xml"],
46+
"classpath:/bl-admin-applicationContext.xml",
47+
"classpath:/bl-cms-contentClient-applicationContext.xml",
48+
"classpath:/bl-cms-contentCreator-applicationContext.xml"],
4749
loader = BroadleafGenericGroovyXmlWebContextLoader.class)
4850
])
4951
@DirtiesContext
5052
@WebAppConfiguration
51-
class AdminIntegrationSetup extends Specification {
52-
53+
class RootAdminIntegrationSetup extends Specification {
54+
/*
55+
* Intentionally left blank. Subclasses should be inheriting from
56+
* the configuration annotations defined at the class level
57+
*/
5358
}

integration/src/test/groovy/org/broadleafcommerce/test/SiteIntegrationSetup.groovy renamed to integration/src/test/groovy/org/broadleafcommerce/test/RootSiteIntegrationSetup.groovy

+7-3
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,15 @@ import spock.lang.Specification
4141
@TransactionConfiguration(transactionManager = "blTransactionManager")
4242
@ContextHierarchy([
4343
@ContextConfiguration(name = "siteContexts",
44-
locations = ["classpath:/bl-open-admin-contentClient-applicationContext.xml"],
44+
locations = ["classpath:/bl-open-admin-contentClient-applicationContext.xml",
45+
"classpath:/bl-cms-contentClient-applicationContext.xml"],
4546
loader = BroadleafGenericGroovyXmlWebContextLoader.class)
4647
])
4748
@DirtiesContext
4849
@WebAppConfiguration
49-
class SiteIntegrationSetup extends Specification {
50-
50+
class RootSiteIntegrationSetup extends Specification {
51+
/*
52+
* Intentionally left blank. Subclasses should be inheriting from
53+
* the configuration annotations defined at the class level
54+
*/
5155
}

0 commit comments

Comments
 (0)