Commit Graph

11 Commits

Author SHA1 Message Date
Phillip Webb 71601c3b96 Merge branch '1.4.x' into 1.5.x 2017-01-25 16:48:33 -08:00
Phillip Webb 2cf93f89f5 Polish 2017-01-25 16:45:59 -08:00
Stephane Nicoll 4a60de78ff Merge branch '1.4.x' into 1.5.x 2017-01-24 09:56:26 +01:00
Stephane Nicoll 4efa4590f8 Review doc on advanced datasource customization
Closes gh-7652
2017-01-24 09:55:13 +01:00
Phillip Webb 1657120286 Move ModifiedClassPathRunner to its own module
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.

Fixes gh-7420
2016-11-18 17:27:54 -08:00
Andy Wilkinson 1cd781b242 Make spring-boot-test compatible with Mockito 2.1 and 2.2
We use some internal Mockito classes and some  breaking API changes
have been made to them in Mockito 2. This commit introduces a utility
class, SpringBootMockUtil, to shield our code from these differences.
Mockito 1 is called directly and Mockito 2 is called via reflection.

To allow these changes to be tested, FilteredClassPathRunner has been
enhanced to also support overriding a dependency on the class path.
As a result it has been renamed to ModifiedClassPathRunner. The new
ClassPathOverrides annotation can be used to provide the Maven
coordinates of one or more dependencies that should be resolved and
added to the class path. Such additions are added to the start of
the class path so that they override any existing dependency that
contains the same classes.

Closes gh-6520
2016-11-18 16:39:44 +00:00
Andy Wilkinson 28ea6fd38a Fix LegacyCookieProcessor configuration example and test it
Closes gh-6827
2016-09-15 14:53:14 +01:00
Andy Wilkinson a1e3dcebd4 Polish “Improve documentation for testing with Spock”
Closes gh-6539
2016-08-16 16:07:02 +01:00
Andy Wilkinson 49202570e9 Update SpringApplicationBuilder example in the docs and test it
Closes gh-6488
2016-08-16 13:14:56 +01:00
Phillip Webb a61a45092d Revert "Add generator app for simple table of *AutoConfiguration"
This reverts commit 89283e46b8.

Revert until we can find a new home, outside of the usual build
process.
2014-02-12 11:01:03 -08:00
Dave Syer 89283e46b8 Add generator app for simple table of *AutoConfiguration
Run with "mvn spring-boot:run" and then scrape the Markdown from stdout.
(Result already added to docs/autoconfig.md.)
2014-02-12 12:39:40 +00:00