Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2017-04-12 11:46:43 +02:00
commit f4ab574ea1

View File

@ -5287,6 +5287,11 @@ how your tests will run:
* `NONE` -- Loads an `ApplicationContext` using `SpringApplication` but does not provide
_any_ servlet environment (mock or otherwise).
NOTE: If your test is `@Transactional`, it will rollback the transaction at the end of
each test method by default. If you're using this arrangement in combination with either
`RANDOM_PORT` or `DEFINED_PORT`, any transaction initiated on the server won't rollback as
the test is running in a different thread than the server processing.
NOTE: In addition to `@SpringBootTest` a number of other annotations are also
provided for testing more specific slices of an application. See below for details.