Merge branch '1.1.x'

2014-11-25 10:51:44 +00:00 · 2014-11-25 10:51:44 +00:00 · 023d5bea3b
parent 6d97785030 feddb2e8a1
commit 023d5bea3b
1 changed files with 4 additions and 0 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@ -2358,6 +2358,10 @@ Boot specific context loader:
 	}
 ----

+NOTE: The annotations <<boot-features-testing-spring-boot-applications,described above>>
+can be used with Spock, i.e. you can annotate your `Specification` with
+`@IntegrationTest` and `@WebAppConfiguration` to suit the needs of your tests.
+


 [[boot-features-test-utilities]]