Merge branch '2.0.x'

0dc4afde · Madhura Bhave · f0004c4a · d6991e6d · 0dc4afde
Commit 0dc4afde authored Oct 22, 2018 by Madhura Bhave
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

FreeMarkerAutoConfigurationServletIntegrationTests.java ...r/FreeMarkerAutoConfigurationServletIntegrationTests.java +1 -2

No files found.
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java
@@ -112,8 +112,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests {
 	@Test
 	public void customTemplateLoaderPath() throws Exception {
-		load(
+		load("spring.freemarker.templateLoaderPath:classpath:/custom-templates/");
-				"spring.freemarker.templateLoaderPath:classpath:/custom-templates/");
 		MockHttpServletResponse response = render("custom");
 		String result = response.getContentAsString();
 		assertThat(result).contains("custom");