Merge branch '1.1.x'

023d5bea · Andy Wilkinson · 6d977850 · feddb2e8 · 023d5bea
Commit 023d5bea authored Nov 25, 2014 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

spring-boot-features.adoc spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +4 -0

No files found.
--- 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]]