Andy Wilkinson
575d83737a
Merge branch '2.5.x'
...
Closes gh-27799
2021-08-23 13:27:22 +01:00
Andy Wilkinson
e409489859
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27798
2021-08-23 13:26:37 +01:00
Andy Wilkinson
f8ef90813f
Allow @MockBean to be used with Framework's @Repeat
...
Fixes gh-27693
2021-08-23 12:38:15 +01:00
Andy Wilkinson
fd2fbcb3c6
Merge branch '2.5.x'
...
Closes gh-27758
2021-08-18 18:28:34 +01:00
Andy Wilkinson
6d8ba3e8b1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
2021-08-18 17:52:42 +01:00
izeye
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
2021-08-18 17:38:40 +01:00
Andy Wilkinson
01e741d703
Prohibit circular references by default
...
Closes gh-27652
2021-08-17 14:51:39 +01:00
Andy Wilkinson
228e4e3bc8
Make it easier to add new config options to ApplicationContextRunners
...
Closes gh-27690
2021-08-17 14:51:08 +01:00
Andy Wilkinson
e30bf0e3e5
Merge branch '2.5.x'
...
Closes gh-27528
2021-07-29 18:47:40 +01:00
Andy Wilkinson
43d623e696
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27527
2021-07-29 18:47:31 +01:00
Andy Wilkinson
7eb5f35f2f
Make WebTestClient creation back off when no HTTP client available
...
Fixes gh-27520
2021-07-29 18:45:53 +01:00
Andy Wilkinson
355226c21e
Merge branch '2.5.x'
...
Closes gh-27474
2021-07-23 13:09:37 +01:00
Andy Wilkinson
eaca9c7a83
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27473
2021-07-23 13:09:27 +01:00
Andy Wilkinson
ee07d6c3ca
Increase response timeout for server-bound WebTestClients
...
Closes gh-27472
2021-07-23 13:06:25 +01:00
Andy Wilkinson
3e0baf1bfd
Merge branch '2.5.x'
...
Closes gh-27353
2021-07-15 19:45:32 +01:00
Andy Wilkinson
c8c784bd5c
Allow @SpyBean to be used to spy on a Spring Data repository
...
Fixes gh-7033
2021-07-15 19:44:52 +01:00
Stephane Nicoll
dc5acb0019
Remove deprecated code flagged for removal
...
Closes gh-27303
2021-07-14 11:50:01 +02:00
Stephane Nicoll
9e46061aa6
Allow to chain ContextConsumer implementations
...
Closes gh-26723
2021-06-11 16:04:34 +02:00
Phillip Webb
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99
Update copyright year of changed files
2021-06-08 18:03:46 -07:00
Andy Wilkinson
e317079446
Merge branch '2.4.x'
...
Closes gh-26524
2021-05-17 11:27:57 +01:00
Andy Wilkinson
49d362fd7f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26523
2021-05-17 11:27:46 +01:00
weixsun
7f445630e4
Remove unnecessary semicolon
...
See gh-26446
2021-05-17 11:26:57 +01:00
Andy Wilkinson
05a64ecb2c
Merge branch '2.4.x'
...
Closes gh-26522
2021-05-17 11:24:29 +01:00
Andy Wilkinson
2a2c68f8f2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26521
2021-05-17 11:22:48 +01:00
Andy Wilkinson
be807bab12
Polish "Improve documentation of TestRestTemplate's fault tolerance"
...
See gh-26227
2021-05-17 11:07:42 +01:00
Carlos Rafael de Oliveira Carneiro
a6fa8addb9
Improve documentation of TestRestTemplate's fault tolerance
...
See gh-26227
2021-05-17 11:07:42 +01:00
Stephane Nicoll
d3c817b7ba
Polish "Remove unnecessary throws declaration in tests"
...
See gh-26441
2021-05-17 09:36:53 +02:00
weixsun
8a2be288a3
Remove unnecessary throws declaration in tests
...
See gh-26441
2021-05-17 09:31:51 +02:00
Stephane Nicoll
691bbcfdfd
Update copyright year of changed files
...
See gh-26448
2021-05-16 15:29:48 +02:00
weixsun
d115361980
Remove redundant suppression
...
See gh-26448
2021-05-16 15:10:48 +02:00
Phillip Webb
a28a3ae090
Merge branch '2.3.x' into 2.4.x
2021-03-30 09:25:46 -07:00
Phillip Webb
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb
26dd1b9a26
Update deprecations with for removal targets
...
Update all deprecation tags to include a removal target.
Closes gh-25808
2021-03-29 15:44:58 -07:00
Phillip Webb
11a94ee6f0
Merge branch '2.3.x' into 2.4.x
2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3
Update copyright year of changed files
2021-03-23 12:50:49 -07:00
Andy Wilkinson
2f95c1e2c8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25513
2021-03-05 14:16:07 +00:00
Andy Wilkinson
22b73f3020
Polish "Improve documentaion of Mockito test execution listeners"
...
See gh-25375
2021-03-05 14:14:36 +00:00
dreis2211
1ccd8dae8a
Allow the project to be built with Java 16
...
See gh-25171
2021-03-04 18:54:56 +00:00
Andy Wilkinson
297e3079d0
Fix handling of UriTemplateRequestEntity in TestRestTemplate
...
A change [1] in Spring Framework 5.3 means that getUrl() on a
RequestEntity will throw an UnsupportedOperationException if the
entity was created using a template.
This commit updates TestRestTemplate to check for instances of
UriTemplateRequestEntity and to resolve the URI using the
entity's UriTemplateHandler instead of calling getUrl() directly.
Fixes gh-25097
[1] a0f4d81db7
2021-02-04 10:59:00 +00:00
Andy Wilkinson
788a42d694
Merge branch '2.3.x' into 2.4.x
...
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380
Add junit-platform-launcher dependency by convention
...
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb
d06407ec0a
Update copyright year of changed files
2021-01-26 19:06:14 -08:00
Phillip Webb
d95d7a0245
Update code for Spring Framework 5.3.4
...
See gh-24998
2021-01-26 17:35:54 -08:00
Madhura Bhave
920136d908
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24678
2021-01-06 16:44:32 -08:00
Madhura Bhave
73a2a4b383
Consider context-path for WebTestClient baseUrl
...
Fixes gh-24168
2021-01-06 16:42:09 -08:00
dreis2211
fb207f73e7
Remove deprecated SpringBootContextLoader#getArgs()
...
See gh-24550
2020-12-21 09:44:28 +01:00
Phillip Webb
d6890e39a7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24536
2020-12-16 13:10:35 -08:00
dreis2211
0ec603cdad
Avoid duplicates in MergedContextConfiguration
...
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.
See gh-24532
2020-12-16 12:50:54 -08:00