Merge branch '1.1.x'

38585ec4 · Phillip Webb · 9d9819c3 · 258059ea · 38585ec4
Commit 38585ec4 authored Sep 25, 2014 by Phillip Webb
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 11 deletions

ThymeleafAutoConfigurationTests.java ...oconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java +0 -11

No files found.
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
@@ -140,17 +140,6 @@ public class ThymeleafAutoConfigurationTests {
 		context.close();
 	}

-	@Test
-	public void useDataDialect() throws Exception {
-		this.context.register(ThymeleafAutoConfiguration.class,
-				PropertyPlaceholderAutoConfiguration.class);
-		this.context.refresh();
-		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
-		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
-		String result = engine.process("data-dialect", attrs);
-		assertEquals("<html><body data-foo=\"bar\"></body></html>", result);
-	}
-
 	@Test
 	public void renderTemplate() throws Exception {
 		this.context.register(ThymeleafAutoConfiguration.class,