Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2016-04-20 10:58:41 +01:00
parent 596a54e5ca 7709543e67
commit aa19c19753
4 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-test/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
View File

@@ -246,8 +246,8 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
WebMergedContextConfiguration webConfiguration) {
SpringBootMockServletContext servletContext = new SpringBootMockServletContext(
webConfiguration.getResourceBasePath());
initializers.add(0,
new ServletContextApplicationContextInitializer(servletContext));
initializers.add(0, new ServletContextApplicationContextInitializer(
servletContext, true));
}
}