0568afc6cb
Merge branch '1.5.x'
2016-11-30 08:31:41 +01:00
423f8037ce
Polish
...
Closes gh-7530
2016-11-30 08:31:13 +01:00
96ca884450
Merge branch '1.5.x'
2016-11-29 18:07:58 +01:00
80da80f930
Make sure that test data sources are unique
2016-11-29 18:07:36 +01:00
fa0bb9cac4
Merge branch '1.5.x'
2016-11-29 15:37:16 +01:00
ba61faee5e
Remove trailing char
2016-11-29 15:37:05 +01:00
2577d79ff1
Merge branch '1.5.x'
2016-11-29 14:54:38 +01:00
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
b4c3f4f504
Merge branch '1.5.x'
2016-11-28 15:37:43 -08:00
5ed00b3501
Merge branch '1.4.x' into 1.5.x
2016-11-28 15:27:07 -08:00
357d072a60
Polish
2016-11-28 15:14:46 -08:00
c212f1078f
Merge branch '1.5.x'
2016-11-24 15:31:55 +01:00
ca788a90e6
Merge branch '1.4.x' into 1.5.x
2016-11-24 15:31:40 +01:00
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
ab3a001286
Merge branch '1.5.x'
2016-11-22 15:49:27 -08:00
dc237043b8
Merge branch '1.4.x' into 1.5.x
2016-11-22 15:48:52 -08:00
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
a501afdeb1
Merge branch '1.5.x'
2016-11-21 13:40:19 +00:00
b2a8be8bbe
Merge branch '1.4.x' into 1.5.x
2016-11-21 13:40:11 +00:00
3423ca87b4
Ensure that RestClientTest can be used without Jackson on the class path
...
Closes gh-7431
2016-11-21 13:36:05 +00:00
d8b7d6dfdc
Merge branch '1.5.x'
2016-11-15 18:53:54 -08:00
764f13453a
Merge branch '1.4.x' into 1.5.x
2016-11-15 13:58:54 -08:00
bacf0878af
Polish
2016-11-15 10:40:21 -08:00
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
0e92271a19
Merge branch '1.5.x'
2016-11-08 10:58:17 +01:00
5878e5eec5
Merge branch '1.4.x' into 1.5.x
2016-11-08 10:57:58 +01:00
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
0a4a84d357
Merge branch '1.5.x'
2016-11-06 11:44:27 +01:00
3018e95261
Merge branch '1.4.x' into 1.5.x
2016-11-06 11:44:12 +01:00
ebfd86ea26
Polish contribution
...
Closes gh-7326
2016-11-06 11:42:45 +01:00
e8b0a64872
Add @Inherited to all AutoConfigure* classes
...
See gh-7326
2016-11-06 11:39:12 +01:00
98a3ae9ac4
Merge branch '1.5.x'
2016-10-31 23:13:37 -07:00
5b66ffbb4b
Merge branch '1.4.x' into 1.5.x
2016-10-31 23:09:36 -07:00
39d5881bf2
Respect 'primary' flag when replacing databases
...
Update TestDatabaseAutoConfiguration to ensure that the the `primary`
flag of the `BeanDefinition` is copied.
Closes gh-7217
2016-10-31 16:26:41 -07:00
0234191b0a
Merge branch '1.5.x'
2016-10-24 11:12:12 +02:00
4855bfb152
Merge branch '1.4.x' into 1.5.x
2016-10-24 11:11:56 +02:00
a03ce0a9d1
Polish contribution
...
Add missing test
Closes gh-7193
2016-10-24 11:11:15 +02:00
0b5fbbedf4
Add a missing return
...
This commit adds a missing`return` in `getDataSourceBeanDefinition()`.
See gh-7193
2016-10-24 10:41:20 +02:00
6643ec3713
Next development version
2016-09-21 17:05:50 +02:00
6bd670edbc
Initiate 1.4.x branch
2016-09-21 11:11:24 +02:00
7e9ed5e1a7
Next Development Version
2016-09-21 07:58:07 +00:00
a994b11a73
Polish
2016-09-18 23:38:21 -07:00
e239e64cb1
Only print MVC interactions when tests fail
...
Update `@AutoConfigureMockMvc` with a `printOnlyOnFailure` option which
allows errors to be printed only when tests fail. Defaults to `true`
meaning the logs are no longer cluttered with MVC results for passing
tests.
Fixes gh-6653
2016-09-18 23:37:46 -07:00
0a9bcd9893
Polish
2016-09-18 10:29:14 +01:00
ac2609b585
Fix WebDriver lifecycle issues
...
Update WebDriver support to ensure that the `.quit()` method is called
after each test method runs and that a new WebDriver instance is
injected each time.
Support is provided by introducing a new `Scope` which is applied by
a ContextCustomizerFactory and reset by a TestExecutionListener.
Fixes gh-6641
2016-09-18 00:18:29 -07:00
0ef845b96e
Polish
2016-09-17 20:05:21 -07:00
82ae6e4049
Improve @AutoConfigureTestDatabase failure message
...
Fixes gh-6916
2016-09-17 19:56:25 -07:00
2c621f4094
Fix @AutoConfigureTestDatabase imports
...
Update `@AutoConfigureTestDatabase` so that it always imports
`DataSourceAutoConfiguration`. Prior to this commit the annotation
could only be applied if something else also imported DataSource
auto-configuration.
Fixes gh-6897
2016-09-16 16:49:36 -07:00
3e19f8aa8d
Relax TestEntityManager @ID restriction
...
Change TestEntityManager so that entities with an ID can be persisted.
Fixes gh-6546
2016-09-15 17:22:52 -07:00
25c4e261e9
Fix failing tests
...
See gh-6897
2016-09-15 17:16:26 -07:00
Stephane Nicoll
Johnny Lim
Phillip Webb
Andy Wilkinson
Spring Buildmaster
sebastiankirsch
Greg Potter