Stephane Nicoll
dbb9a1bd20
Merge branch '1.5.x'
2017-01-06 10:13:20 +01:00
Stephane Nicoll
7a75fb0f38
Fix test-specific configuration metadata
...
Most of the config keys defined by the `spring-boot-test-autoconfigure`
module can't be overridden because they are mapped with `@PropertyMapping`
on an annotation. It is confusing that such keys are exposed in content
assistance as using them will have no effect.
This commit removes the annotation processor from the build so that the
`@ConfigurationProperties` beans aren't processed anymore. Instead, manual
metadata is written for the two only keys that are effectively used in
regular configuration.
As a result, the `additional-spring-configuration-metadata` file has been
renamed to `spring-configuration-metadata` since nothing is processing it
anymore.
Closes gh-7887
2017-01-06 10:12:57 +01:00
Phillip Webb
125d9d6181
Merge branch '1.5.x'
2017-01-04 20:04:09 -08:00
Phillip Webb
e015e13b4d
Include ErrorAttributes in @WebMvcTest
...
Import the additional auto-configuration classes required for
`ErrorAttributes` and change the filter so that it's no longer
hidden.
Fixes gh-7867
2017-01-04 15:25:33 -08:00
Stephane Nicoll
506f6497c0
Merge branch '1.5.x'
2017-01-04 09:56:19 +01:00
Johnny Lim
f915ae197a
Polish
2017-01-04 09:53:45 +01:00
Phillip Webb
86a42e4e44
Merge branch '1.5.x'
2016-12-30 00:32:00 -08:00
Phillip Webb
54aeff47a2
Add exclude support to @ImportAutoConfiguration
...
Update `@ImportAutoConfiguration` with support for an exclude attribute
that works in a similar way to `@EnableAutoConfiguration`.
Also update existing `@Test...` annotation with exclude attribute
aliases.
Fixes gh-6809
2016-12-30 00:31:30 -08:00
Phillip Webb
8b69856fc9
Polish
2016-12-28 15:23:26 -08:00
Phillip Webb
1f417997f3
Merge branch '1.5.x'
2016-12-19 13:21:18 -08:00
Phillip Webb
6121208cbb
Polish formatting
2016-12-19 12:47:03 -08:00
Phillip Webb
4b9cba351b
Merge branch '1.4.x' into 1.5.x
2016-12-19 12:36:57 -08:00
Phillip Webb
bd74c3d327
Polish formatting
2016-12-19 12:25:09 -08:00
Stephane Nicoll
e3496614be
Merge branch '1.5.x'
2016-12-16 10:53:53 +01:00
Stephane Nicoll
21b815aabd
Polish contribution
...
Closes gh-7560
2016-12-16 10:52:43 +01:00
Eddú Meléndez
5a7624df7c
Add support for property spring.test.database.replace
...
Closes gh-7229
2016-12-16 09:40:55 +01:00
Stephane Nicoll
9056e9bd7e
Merge branch '1.5.x'
2016-12-15 16:55:49 +01:00
Stephane Nicoll
d8d5950e99
Enable validation in AutoConfigureWebMvc
...
Closes gh-7582
2016-12-15 16:55:34 +01:00
Stephane Nicoll
816c236e5b
Merge branch '1.5.x'
2016-12-01 16:28:29 +01:00
Stephane Nicoll
ee72e788ed
Rename spring-boot-junit-runners to spring-boot-test-support
...
Closes gh-7421
2016-12-01 16:25:47 +01:00
Stephane Nicoll
4a97b38524
Remove deprecated code
...
Closes gh-6563
2016-11-30 11:18:35 +01:00
Stephane Nicoll
0568afc6cb
Merge branch '1.5.x'
2016-11-30 08:31:41 +01:00
Johnny Lim
423f8037ce
Polish
...
Closes gh-7530
2016-11-30 08:31:13 +01:00
Stephane Nicoll
96ca884450
Merge branch '1.5.x'
2016-11-29 18:07:58 +01:00
Stephane Nicoll
80da80f930
Make sure that test data sources are unique
2016-11-29 18:07:36 +01:00
Stephane Nicoll
fa0bb9cac4
Merge branch '1.5.x'
2016-11-29 15:37:16 +01:00
Stephane Nicoll
ba61faee5e
Remove trailing char
2016-11-29 15:37:05 +01:00
Stephane Nicoll
2577d79ff1
Merge branch '1.5.x'
2016-11-29 14:54:38 +01:00
Stephane Nicoll
b618c70e52
Add test slice for pure jdbc tests
...
This commit adds `@JdbcTest`, a new test slice for pure jdbc tests. It
provides the same basic features than `@DataJpaTest`.
Closes gh-6563
2016-11-29 14:54:15 +01:00
Phillip Webb
b4c3f4f504
Merge branch '1.5.x'
2016-11-28 15:37:43 -08:00
Phillip Webb
5ed00b3501
Merge branch '1.4.x' into 1.5.x
2016-11-28 15:27:07 -08:00
Phillip Webb
357d072a60
Polish
2016-11-28 15:14:46 -08:00
Stephane Nicoll
c212f1078f
Merge branch '1.5.x'
2016-11-24 15:31:55 +01:00
Stephane Nicoll
ca788a90e6
Merge branch '1.4.x' into 1.5.x
2016-11-24 15:31:40 +01:00
Stephane Nicoll
4bf645c615
AutoconfigureTestDatabase replace with a fresh database
...
Previously, two or more `@DataJpaTest` tests in the same test suite were
sharing the same in-memory database instance. This commit makes sure
that `TestDatabaseAutoConfiguration` creates a unique embedded database
for each test it operates on.
Closes gh-7473
2016-11-24 15:31:27 +01:00
Phillip Webb
ab3a001286
Merge branch '1.5.x'
2016-11-22 15:49:27 -08:00
Phillip Webb
dc237043b8
Merge branch '1.4.x' into 1.5.x
2016-11-22 15:48:52 -08:00
Phillip Webb
74670cb20f
Allow WebDriver beans to define their own scope
...
Update `WebDriverScope` so that only `WebDriver` beans with no explicit
scope are moved.
Fixes gh-7454
2016-11-22 15:48:28 -08:00
Andy Wilkinson
a501afdeb1
Merge branch '1.5.x'
2016-11-21 13:40:19 +00:00
Andy Wilkinson
b2a8be8bbe
Merge branch '1.4.x' into 1.5.x
2016-11-21 13:40:11 +00:00
Andy Wilkinson
3423ca87b4
Ensure that RestClientTest can be used without Jackson on the class path
...
Closes gh-7431
2016-11-21 13:36:05 +00:00
Phillip Webb
d8b7d6dfdc
Merge branch '1.5.x'
2016-11-15 18:53:54 -08:00
Phillip Webb
764f13453a
Merge branch '1.4.x' into 1.5.x
2016-11-15 13:58:54 -08:00
Phillip Webb
bacf0878af
Polish
2016-11-15 10:40:21 -08:00
Spring Buildmaster
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
Stephane Nicoll
0e92271a19
Merge branch '1.5.x'
2016-11-08 10:58:17 +01:00
Stephane Nicoll
5878e5eec5
Merge branch '1.4.x' into 1.5.x
2016-11-08 10:57:58 +01:00
Stephane Nicoll
318701daa7
Apply DispatcherServlet customizations to MockMvc
...
This commits makes sure that customizations on `DispatcherServlet` are
also applied to the `TestDispatcherServlet` that `MockMvc` is using
internally.
Closes gh-5891
2016-11-08 10:56:54 +01:00
Stephane Nicoll
0a4a84d357
Merge branch '1.5.x'
2016-11-06 11:44:27 +01:00
Stephane Nicoll
3018e95261
Merge branch '1.4.x' into 1.5.x
2016-11-06 11:44:12 +01:00
