Dave Syer
258d624975
Merge branch 'master' into 2.0.x
2017-08-30 09:31:49 +01:00
Dave Syer
51a35ce6b7
Use wiremock-standalone instead of the ambient server
...
The standalone jar is in much better shape now, and relocates all the
dependencies, like guava and jetty, so it's safe to use in a Spring
Boot project with Tomcat or a different version of jetty.
Fixes gh-397
2017-08-30 08:29:29 +01:00
Marcin Grzejszczak
0000d408b6
Merge branch 'master' into 2.0.x
2017-08-29 15:40:52 +02:00
Marcin Grzejszczak
5381ef8447
Merge branch '1.1.x'
2017-08-29 15:40:30 +02:00
Marcin Grzejszczak
113d4e2a4d
Migrated to new docs
2017-08-29 15:39:55 +02:00
Marcin Grzejszczak
f4e33c4790
Updated docs
2017-08-29 10:06:28 +02:00
Marcin Grzejszczak
e3210ed837
Merge branch 'master' into 2.0.x
2017-08-29 10:03:57 +02:00
Marcin Grzejszczak
587a0c37a0
New docs; fixes #395
2017-08-29 09:53:47 +02:00
Marcin Grzejszczak
7573aa2697
Merge branch 'master' into 2.0.x
2017-08-28 17:31:20 +02:00
Marcin Grzejszczak
e48a29297a
Merge branch '1.1.x'
2017-08-28 17:31:09 +02:00
WhyINeedToFillUsername
08f20afd91
Updated description of byType testMatcher ( #394 )
...
fixes #393
2017-08-28 16:27:03 +02:00
Marcin Grzejszczak
d9eac4bf31
Merge branch 'master' into 2.0.x
2017-08-28 16:10:11 +02:00
Marcin Grzejszczak
4e122278a6
Merge branch '1.1.x'
2017-08-28 16:09:59 +02:00
Marcin Grzejszczak
49df7bf472
Wrong assertion type is picked for Iterables
...
without this change in the generated test when SpringCloudContractAssertions are used the compiler is picking an invalid type of Assertj Assertions.
with this change we're explicitly casting to the appropriate interface so that the SpringCloudContractAssertions methods are picked
fixes #381
2017-08-28 16:09:51 +02:00
Marcin Grzejszczak
4c82cf1b58
Revert "Wrong assertion type is picked for Iterables"
...
This reverts commit 8d2549fecf
2017-08-28 16:04:13 +02:00
Marcin Grzejszczak
39201f11bb
Merge branch 'master' into 2.0.x
2017-08-28 16:01:02 +02:00
Marcin Grzejszczak
50c5a416bb
Merge branch '1.1.x'
2017-08-28 15:52:24 +02:00
Marcin Grzejszczak
8d2549fecf
Wrong assertion type is picked for Iterables
...
without this change in the generated test when SpringCloudContractAssertions are used, we're casting the read element of the JSON to a Collection class whereas we should be casting to an Iterable.
fixes #381
2017-08-28 15:39:34 +02:00
Marcin Grzejszczak
e31ad2a81a
Merge branch 'master' into 2.0.x
2017-08-28 10:02:30 +02:00
Marcin Grzejszczak
8e850a9184
Merge branch '1.1.x'
2017-08-28 10:02:19 +02:00
Marcin Grzejszczak
1c0d4e56cf
Added more documentation to the byCommand assertion; #299
2017-08-28 10:02:13 +02:00
Marcin Grzejszczak
1bdbd046ad
Going back to snapshots
2017-08-25 15:12:32 +02:00
Marcin Grzejszczak
1550f9fe0f
Update SNAPSHOT to 2.0.0.M2
2017-08-25 15:10:01 +02:00
Marcin Grzejszczak
aea4f212fa
Fixed docs parent pom
2017-08-25 15:01:31 +02:00
Marcin Grzejszczak
ccdeda1fe1
Going back to snapshots
2017-08-25 14:58:18 +02:00
Marcin Grzejszczak
9782ec10ea
Update SNAPSHOT to 1.2.0.M1
2017-08-25 14:55:31 +02:00
Marcin Grzejszczak
011f4b3e31
Merge branch 'master' into 2.0.x
2017-08-24 12:08:12 +02:00
Marcin Grzejszczak
3b88fea8bd
basePackageForTests can be configured automatically
...
without this change we always set the default value of the package with generated tests, unless a value overrides it.
with this change the flow for setting the generated tests package name will look like this:
- pick basePackageForTests
- if basePackageForTests wasn't set pick the package from baseClassForTests
- if baseClassForTests wasn't set pick packageWithBaseClasses
- if nothing got set pick the default org.springframework.cloud.contract.verifier.tests
The rationale behind this change is such that often in the base class you would like to have package scoped methods and the fact that the tests are always generated in the default location requires to make these methods public or always override this property.
fixes #260
2017-08-24 12:08:02 +02:00
Marcin Grzejszczak
b99bf95ff9
Bumping versions to 1.1.4.BUILD-SNAPSHOT after release
2017-08-21 12:33:24 +02:00
Marcin Grzejszczak
237ee85dc3
Going back to snapshots
2017-08-21 12:33:24 +02:00
Marcin Grzejszczak
b81bb2a489
Update SNAPSHOT to 1.1.3.RELEASE
2017-08-21 12:28:10 +02:00
Marcin Grzejszczak
1b00129a25
Merge branch 'master' into 2.0.x
2017-08-18 18:15:50 +02:00
Marcin Grzejszczak
b49d5724d3
Merge branch '1.1.x'
2017-08-18 18:15:41 +02:00
Marcin Grzejszczak
1cebf3f450
Add documentation that matchers are removing only part of request / response
...
fixes #383
2017-08-18 18:04:17 +02:00
Marcin Grzejszczak
1f5d3a1f16
Whitelisted 2.0.x branch
2017-08-07 17:14:08 +02:00
Marcin Grzejszczak
5e3efb9d69
Merge branch 'master' into 2.0.x
2017-08-07 17:11:38 +02:00
Marcin Grzejszczak
3ff1e6573b
Merge branch '1.1.x'
2017-08-07 17:08:09 +02:00
Marcin Grzejszczak
7f22c14371
Lowered number of elements in toc
2017-08-07 17:07:35 +02:00
Marcin Grzejszczak
8cccad5eba
Merge branch 'master' into 2.0.x
2017-08-07 16:54:04 +02:00
Marcin Grzejszczak
4912cb0e8e
Merge branch '1.1.x'
2017-08-07 16:40:26 +02:00
Marcin Grzejszczak
2dd22d6646
Added 1.1.x to whitelisted branches
2017-08-07 16:37:07 +02:00
Marcin Grzejszczak
c32da1a96e
Updated the documentation layout and style
2017-08-07 16:34:42 +02:00
Marcin Grzejszczak
53a5fe7076
Merge branch 'master' into 2.0.x
2017-07-31 16:11:18 +02:00
Marcin Grzejszczak
b431f1b788
Bumped WireMock to 2.7.1 and added debug option for WireMock
...
fixes #374 #369
2017-07-31 16:09:35 +02:00
Marcin Grzejszczak
e4af835b8e
Going back to snapshots
2017-07-21 14:30:45 +02:00
Marcin Grzejszczak
85f458e34c
Update SNAPSHOT to 1.1.2.RELEASE
2017-07-21 14:06:43 +02:00
Marcin Grzejszczak
473a2b9197
Merge branch 'master' into 2.0.x
2017-07-18 17:30:48 +02:00
Marcin Grzejszczak
4de7d38a51
Added support for referencing file contents in the contract ( #360 )
...
without this change, large bodies can't be parsed by the compiler
with this change we allow those bodies to be read from files
fixes #357
2017-07-18 16:26:44 +02:00
Marcin Grzejszczak
0ea6d366aa
Merge branch 'master' into 2.0.x
2017-07-13 19:14:04 +02:00
Marcin Grzejszczak
ff03b25cb3
Merge branch '1.1.x'
2017-07-13 19:13:04 +02:00
