Marcin Grzejszczak
a893c0c93f
Merge branch 'master' into 2.0.x
2017-10-23 12:59:05 +02:00
Marcin Grzejszczak
3930a0450a
Bumped WireMock to 2.10.0; fixes #444
2017-10-23 12:58:57 +02:00
Eddú Meléndez Gonzales
a90ec81258
Fix WireMockRestDocs javadoc ( #442 )
2017-10-22 14:20:54 +02:00
Spencer Gibb
0d7ac46e2e
Remove uses of DiscoveryClient.getLocalServiceInstance()
...
This was previously deprecated previously and removed in spring-cloud-commons 2.0.x
2017-10-19 11:15:52 -04:00
Marcin Grzejszczak
2aac2cc7c2
Merge branch 'master' into 2.0.x
2017-10-19 14:35:25 +02:00
Marcin Grzejszczak
143acc4ae2
Merge branch '1.1.x'
2017-10-19 14:35:17 +02:00
Marcin Grzejszczak
04bd1f5be7
Fixed unnecessary quotes for java messaging tests
2017-10-19 14:35:11 +02:00
Marcin Grzejszczak
40fc6886c5
Merge branch 'master' into 2.0.x
2017-10-19 11:51:25 +02:00
Marcin Grzejszczak
25bba16ce8
Merge branch '1.1.x'
2017-10-19 11:51:13 +02:00
Marcin Grzejszczak
6aa8910ae8
Added ExecutionProperty resolution for sentTo; fixes #440
2017-10-19 11:16:48 +02:00
Marcin Grzejszczak
68de9d8d19
Merge branch 'master' into 2.0.x
2017-10-18 08:57:34 +02:00
Marcin Grzejszczak
d752092d2c
Bumped WireMock to 2.9.0; fixes #439
2017-10-18 08:54:31 +02:00
Marcin Grzejszczak
12d85f8e88
Added missing conditionals for rest docs
2017-10-17 09:48:05 +02:00
Eddú Meléndez Gonzales
4a9fb48056
Add support for restassured with restdocs ( #431 )
...
fixes gh-334
2017-10-16 10:02:40 +02:00
Marcin Grzejszczak
0785131069
How about now?
2017-10-11 13:35:00 +02:00
Marcin Grzejszczak
b26f7f0023
Or now?
2017-10-11 13:19:14 +02:00
Marcin Grzejszczak
25feb0c0db
Maybe now?
2017-10-11 13:15:05 +02:00
Marcin Grzejszczak
e4c55f128e
Please work?
2017-10-11 13:01:58 +02:00
Marcin Grzejszczak
59dbbde471
Should work?
2017-10-11 12:47:43 +02:00
Marcin Grzejszczak
f6e271b807
Fixed the tests
2017-10-11 12:35:35 +02:00
Marcin Grzejszczak
7242649f9c
Almost there
2017-10-11 12:33:13 +02:00
Marcin Grzejszczak
7756921cdb
Ignored one test - have to think how to fix the stream deserialization
2017-10-10 08:22:15 +02:00
Marcin Grzejszczak
43eef1a1a8
Fixed quite a few tests
2017-10-09 18:22:19 +02:00
Marcin Grzejszczak
9026e08b16
Bumping boot to snapshots
2017-10-06 14:13:58 +02:00
Marcin Grzejszczak
0766528aee
Merge branch 'master' into 2.0.x
2017-10-06 14:13:42 +02:00
Marcin Grzejszczak
68d6dd9ff9
Fixed?
2017-10-06 14:11:34 +02:00
Marcin Grzejszczak
ed0bbc1bc4
Fixed restdocs tests
2017-10-06 12:08:02 +02:00
Marcin Grzejszczak
53330c7585
Merge branch 'master' into 2.0.x
2017-10-06 11:52:39 +02:00
Marcin Grzejszczak
f32be83dba
Fixed restdocs tests
2017-10-06 11:52:10 +02:00
Marcin Grzejszczak
8da33723a4
Merge branch 'master' into 2.0.x
2017-10-06 11:24:21 +02:00
Marcin Grzejszczak
3ec444e776
Fixed the invalid check of transformers array
2017-10-06 11:21:52 +02:00
Marcin Grzejszczak
0758f4ec38
Introduced adding of custom WireMock extensions ( #429 )
...
without this change we set only a single extension "response-transformer" without an option to provide any other ones
with this change we introduce the "spring.factories" based extension model. It's enough to provide your own implementation of `org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockExtensions` and register it in `spring.factories`. That way you can control all extensions (request / response).
fixes #425
2017-10-05 15:52:27 +02:00
Marcin Grzejszczak
5062ff5880
Bumped maven props
2017-10-03 14:25:02 +02:00
Marcin Grzejszczak
5e4eabee19
Bumped gradle props
2017-10-03 14:13:12 +02:00
Marcin Grzejszczak
063cea4f5b
Bumping versions to 1.1.5.BUILD-SNAPSHOT after release
2017-10-03 14:02:15 +02:00
Marcin Grzejszczak
67f4f11119
Going back to snapshots
2017-10-03 14:02:15 +02:00
Marcin Grzejszczak
e1b65dd672
Update SNAPSHOT to 1.1.4.RELEASE
2017-10-03 13:56:14 +02:00
Eddú Meléndez Gonzales
60596004c0
Update Netflix starters dependencies ( #430 )
...
Spring Cloud Netflix project renamed the starters adding `-netflix-` in
the artifactId. This commit fixes with the new artifacId.
2017-10-01 00:43:42 +02:00
Marcin Grzejszczak
f8401ccb38
Merge branch 'master' into 2.0.x
2017-09-30 19:15:14 +02:00
Marcin Grzejszczak
4a46760ee2
Merge branch '1.1.x'
2017-09-30 19:14:57 +02:00
Marcin Grzejszczak
6af2501422
Fixed invalid header parsing for absent matching strategy; fixes #424
2017-09-30 19:14:45 +02:00
Marcin Grzejszczak
5e1b99777b
Merge branch '1.1.x'
2017-09-28 14:40:46 +02:00
Marcin Grzejszczak
521f27b4a7
Bumps jsonassert to fix the issue with isEmpty
...
without this change when we're building a stub and it contains a non-empty array, we execute isEmpty to verify the array size. In jsonassert there's a bug cause isEmpty was the only method that didn't check if a flag to ignore exceptions was set
with this change we're bumping jsonassert where the exception got fixed
fixes #427
2017-09-28 14:37:03 +02:00
Marcin Grzejszczak
ddbe2de516
Merge branch 'master' into 2.0.x
2017-09-19 23:23:49 +01:00
Marcin Grzejszczak
098eb620ca
Merge branch '1.1.x'
2017-09-19 23:15:38 +01:00
Pei-Tang Huang
6c14e8b205
Added composite child support. ( #405 )
...
If specified subDirectoryName exists in more the one FileSource, return
another instance of ResourcesFileSource containing all matched FileSources.
* Fixed multiple files not being registered issue.
* Use default FileSource if no valid resource specified.
2017-09-19 23:14:04 +01:00
Marcin Grzejszczak
d103a7f930
Referencing checkstyle from the sc-build
2017-09-19 23:12:28 +01:00
Marcin Grzejszczak
e35d984c1c
Merge branch 'master' into 2.0.x
2017-09-12 11:51:08 +02:00
Marcin Grzejszczak
cf2350ff3f
Updated readme
2017-09-12 11:42:16 +02:00
Marcin Grzejszczak
ee5a1b997e
Added a note about Rest Assured 3.0
2017-09-12 11:40:56 +02:00
