root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Madhura Bhave 2018-10-22 15:05:16 -07:00
parent f0004c4ade d6991e6d91
commit 0dc4afdefd
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java
View File

@ -112,8 +112,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests {
@Test @Test
public void customTemplateLoaderPath() throws Exception { public void customTemplateLoaderPath() throws Exception {
load( load("spring.freemarker.templateLoaderPath:classpath:/custom-templates/");
"spring.freemarker.templateLoaderPath:classpath:/custom-templates/");
MockHttpServletResponse response = render("custom"); MockHttpServletResponse response = render("custom");
String result = response.getContentAsString(); String result = response.getContentAsString();
assertThat(result).contains("custom"); assertThat(result).contains("custom");