fd677af868
Merge branch '1.5.x'
2017-01-20 16:25:14 +00:00
b71baf2c38
Support @ContextHierarchy when using @SpringBootTest
...
Closes gh-8000
2017-01-20 16:24:42 +00:00
973b7a118c
Merge branch '1.5.x'
2017-01-19 11:03:38 +00:00
c31a2d8101
Merge branch '1.4.x' into 1.5.x
2017-01-19 11:03:33 +00:00
80a1e1ae64
Polishing
2017-01-19 11:03:18 +00:00
84583d2b8f
Merge branch '1.5.x'
2017-01-19 10:58:43 +00:00
4e70cd2934
Merge branch '1.4.x' into 1.5.x
2017-01-19 10:58:34 +00:00
b7a02e7237
Update TestRestTemplate to apply template handler to URIs
...
Previously, TestRestTemplate would only apply the UriTemplateHandler
to Strings and not to URIs. When using the auto-configured
TestRestTemplate, this prevented relative URIs from being
made absolute using LocalHostUriTemplateHandler.
The commit updates TestRestTemplate to turn URIs into Strings before
passing them to the delegate RestTemplate. Turning them into Strings
ensures that the delegate calls the UriTemplateHandler.
Closes gh-7891
2017-01-19 10:39:02 +00:00
d2201d5284
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 18:43:30 -05:00
0fca9aaccb
Polish Mockito 2.0 support
2017-01-05 16:42:12 -08:00
962313d0e1
Merge branch '1.5.x'
2017-01-05 16:30:34 -08:00
abb8e3663a
Polish Mockito 2.0 support
2017-01-05 16:28:59 -08:00
c4779a10ac
Fix Mockito 2 support
...
See gh-7770
2017-01-05 16:27:41 -08:00
77f9bb09ca
Further Polish Mockito 2 support
...
See gh-7770
2017-01-05 14:29:29 -08:00
1169f69390
Polish MockitoApi
2017-01-05 14:02:31 -08:00
9048c97572
Polish Mockito 2 support
...
gh-7770
2017-01-05 13:45:40 -08:00
0cc313f224
Polish
2017-01-05 11:30:33 -08:00
fab43f343d
Merge branch '1.5.x'
2017-01-05 14:22:23 +01:00
6293033e1b
Remove useless dependency
2017-01-05 14:21:59 +01:00
c28ff4314c
Upgrade to Mockito 2
...
Closes gh-7770
2017-01-05 12:22:15 +01:00
ad2ff27208
Merge branch '1.5.x'
2017-01-05 00:01:08 -08:00
fac6b8da47
Upgrade to JSONassert 1.4.0
...
Closes gh-7846
2017-01-05 00:00:07 -08:00
506f6497c0
Merge branch '1.5.x'
2017-01-04 09:56:19 +01:00
f915ae197a
Polish
2017-01-04 09:53:45 +01:00
b1cb8bb3d9
Merge branch '1.5.x'
2017-01-03 15:14:41 -08:00
8ccd4db513
Merge branch '1.4.x' into 1.5.x
2017-01-03 15:14:14 -08:00
556ce14f2d
Fix TestRestTemplate.withBasicAuth interceptors
...
Update `TestRestTemplate` to handle `BasicAuthorizationInterceptor`s
correctly. Prior to this commit the `BasicAuthorizationInterceptor`
was added directly to the `ClientHttpRequestFactory` rather than
to the `RestTemplate`. This meant that it could not easily be removed
when `TestRestTemplate.withBasicAuth` was invoked.
The `TestRestTemplate` now sets the interceptor on `RestTemplate`
directly and relies on the logic in `InterceptingHttpAccessor` to
add it to the `ClientHttpRequestFactory`.
Fixes gh-7812
2017-01-03 15:12:30 -08:00
519f9c6c54
Merge branch '1.5.x'
2016-12-28 15:35:32 -08:00
8b69856fc9
Polish
2016-12-28 15:23:26 -08:00
576d5dd58f
Merge branch '1.5.x'
2016-12-28 12:10:14 +01:00
25bd0e0455
Do not reset server.port if a custom inline property is set
...
This commit allows to define `server.port` in a non-embedded web
environment. Previously, `server.port` would have been set to `-1`
regardless.
Closes gh-7353
2016-12-28 12:10:04 +01:00
a2c50a9828
Merge branch '1.5.x'
2016-12-27 17:37:12 -08:00
884c9ef11e
Remove accidentally committed file
2016-12-27 15:18:17 -08:00
49fa702708
Merge branch '1.5.x'
2016-12-27 15:06:22 -08:00
e0541d0f74
Polish
2016-12-27 14:48:44 -08:00
ec15607bad
Merge branch '1.5.x'
2016-12-25 10:00:48 +01:00
37519ecfef
Merge branch '1.4.x' into 1.5.x
2016-12-25 10:00:33 +01:00
062104f1d6
Fix TestRestTemplate#patchFor methods visibility
...
Closes gh-7742
2016-12-25 10:00:20 +01:00
9057f9ae1f
Next development version
2016-12-23 00:15:23 +00:00
6e02fe59f7
Merge branch '1.5.x'
2016-12-21 22:32:43 -08:00
765fd1dca0
Merge branch '1.4.x' into 1.5.x
2016-12-21 20:15:54 -08:00
138b96cf5f
Use unique `testRestTemplate` bean name
...
Update `SpringBootTestContextCustomizer` to use the full qualified
TestRestTemplate as the registered bean name. Prior to this commit it
was possible that the customizer would replace the relatively common
bean name `testRestTemplate`.
Fixes gh-7711
2016-12-21 11:42:56 -08:00
571544d1b3
Merge branch '1.5.x'
2016-12-19 18:46:03 -08:00
73a45797c0
Merge branch '1.4.x' into 1.5.x
2016-12-19 18:45:35 -08:00
7824171413
Allow @SpyBean to work with @Primary beans
...
Update `MockitoPostProcessor` so that `@SpyBean` will automatically
pick the `@Primary` bean when multiple candidates exist.
Fixes gh-7621
2016-12-19 18:14:51 -08:00
87547f208a
Add test for @SpyBean for generic bean definition
...
Add an integration test to check that @SpyBean can be used with on a
bean definition that returns a generic type.
Closes gh-7625
2016-12-19 15:58:25 -08:00
1f417997f3
Merge branch '1.5.x'
2016-12-19 13:21:18 -08:00
4b9cba351b
Merge branch '1.4.x' into 1.5.x
2016-12-19 12:36:57 -08:00
bd74c3d327
Polish formatting
2016-12-19 12:25:09 -08:00
b000e182a2
Merge branch '1.5.x'
2016-12-19 11:32:33 +01:00
Andy Wilkinson
Phillip Webb
Stephane Nicoll
Johnny Lim
Spring Buildmaster