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
28e86272e8
Merge branch '1.4.x' into 1.5.x
2016-12-19 11:30:56 +01:00
863f97dc11
Polish since version
...
Closes gh-7412
2016-12-19 11:30:38 +01:00
367de7bf71
Add support for new PATCH methods to TestRestTemplate
...
Closes gh-7412
2016-12-19 11:27:10 +01:00
263d444d4e
Merge branch '1.5.x'
2016-12-05 11:20:24 -08:00
f6b0652369
Merge branch '1.4.x' into 1.5.x
2016-12-05 11:17:13 -08:00
e430583eaf
Polish
2016-12-05 11:08:38 -08:00
816c236e5b
Merge branch '1.5.x'
2016-12-01 16:28:29 +01:00
ee72e788ed
Rename `spring-boot-junit-runners` to `spring-boot-test-support`
...
Closes gh-7421
2016-12-01 16:25:47 +01:00
304fff1bee
Merge branch '1.5.x'
2016-12-01 09:38:49 +00:00
3ac22e7cdf
Merge branch '1.4.x' into 1.5.x
2016-12-01 09:38:41 +00:00
d9b8fc960c
Correct the scope of the spock-core dependency in spring-boot-test
...
See gh-7524
2016-12-01 09:38:07 +00:00
881eaab601
Merge branch '1.5.x'
2016-11-30 21:00:48 +00:00
1d476b375f
Merge branch '1.4.x' into 1.5.x
2016-11-30 21:00:36 +00:00
45d672f5b3
Ignore Spock annotations when creating test context cache key
...
Closes gh-7524
2016-11-30 20:59:09 +00:00
e5e22af73e
Merge branch '1.5.x'
2016-11-25 10:41:49 +00:00
3dcb2d5316
Merge branch '1.4.x' into 1.5.x
2016-11-25 10:41:41 +00:00
46e8cf4a43
Test that a broken factory bean does not break resetting of mocks
...
Previously, ResetMocksTestExecutionListener used getBean(name) to
retrieve each instantiated singleton. When the instantiated singleton
was a factory bean, this would cause getObject on the factory bean to
be called. If the factory bean was unable to produce its object, for
example due to test slicing excluding something, an exception would
be thrown.
The previous commit updated ResetMocksTestsExecutionListener to
use getSingleton(name) rather than getBean(name). This will retrieve
the factory bean itself rather than causing the factory bean to
attempt to create an object. This commit updates the tests to verify
the new behaviour.
Closes gh-7270
2016-11-25 10:40:02 +00:00
eb927f1b29
Prevent a broken factory bean from breaking the resetting of mocks
...
Closes gh-7271
2016-11-25 10:39:30 +00:00
e0dfff2b23
Merge branch '1.5.x'
2016-11-22 14:54:17 -08:00
88c84ce234
Merge branch '1.4.x' into 1.5.x
2016-11-22 14:53:30 -08:00
a3b79be6b3
Support @MockBean on FactoryBeans
...
Update @MockBean support so that FactoryBean classes can be mocked.
Fixes gh-7439
2016-11-22 13:49:28 -08:00
1452d3cd51
Ensure withBasicAuth keeps error handler
...
Fix `TestRestTemplate` so that any custom `ErrorHandler` isn't lost
when calling `withBasicAuth`.
Fixes gh-7441
2016-11-22 10:58:30 -08:00
Stephane Nicoll
Johnny Lim
Phillip Webb
Spring Buildmaster
Andy Wilkinson
Aleksander Bartnikiewicz