From 4c292e60f2f78b904a8b595cd81ea61a5584e8a6 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Tue, 18 Mar 2014 10:21:31 +0000
Subject: [PATCH] Add @WebAppConfiguration to webapp tests

---
 app.groovy                      | 9 ++++++++-
 templates/ApplicationTests.java | 7 +++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app.groovy b/app.groovy
index 167a8bd5..f319e08e 100644
--- a/app.groovy
+++ b/app.groovy
@@ -79,6 +79,13 @@ class MainController {
     
     File test = new File(new File(dir, "src/test/java"),request.packageName.replace(".", "/"))
     test.mkdirs()
+    if (model.styles.contains("-web")) { 
+      model.testAnnotations = "@WebAppConfiguration\n"
+      model.testImports = "import org.springframework.test.context.web.WebAppConfiguration;\n"
+    } else { 
+      model.testAnnotations = ""
+      model.testImports = ""
+    }
     write(test, "ApplicationTests.java", model)
 
     File download = new File(tmpdir, dir.name + ".zip")
@@ -97,8 +104,8 @@ class MainController {
   }
 
   def write(File src, String name, def model) { 
-    def body = template name, model
     log.info("Creating: "  + src + "/" + name)
+    def body = template name, model
     new File(src, name).write(body)
   }
 
diff --git a/templates/ApplicationTests.java b/templates/ApplicationTests.java
index 57132396..87e985ab 100644
--- a/templates/ApplicationTests.java
+++ b/templates/ApplicationTests.java
@@ -2,13 +2,12 @@ package ${packageName};
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationContextLoader;
-import org.springframework.test.context.ContextConfiguration;
+${testImports}import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = Application.class, loader=SpringApplicationContextLoader.class)
-public class ApplicationTests {
+@SpringApplicationConfiguration(classes = Application.class)
+${testAnnotations}public class ApplicationTests {
 
 	@Test
 	public void contextLoads() {