From 639b0f554d53c199d1d8f8223012b8cb746ea6de Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 19 Oct 2016 10:50:31 +0100 Subject: [PATCH] Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK Closes gh-7112 --- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 483f1c35f8c..4b2e7f26892 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -4902,7 +4902,8 @@ how your tests will run: * `MOCK` -- Loads a `WebApplicationContext` and provides a mock servlet environment. Embedded servlet containers are not started when using this annotation. If servlet APIs are not on your classpath this mode will transparently fallback to creating a - regular non-web `ApplicationContext`. + regular non-web `ApplicationContext`. Can be used in conjunction with + `@AutoConfigureMockMvc` for `MockMvc`-based testing of your application. * `RANDOM_PORT` -- Loads an `EmbeddedWebApplicationContext` and provides a real servlet environment. Embedded servlet containers are started and listening on a random port.