Commit Graph

1783 Commits

Author SHA1 Message Date
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
f6ffe29a4d Merge branch 'master' into 2.0.x 2017-08-28 15:01:46 +02:00
Marcin Grzejszczak
24f0b98152 Merge branch '1.1.x' 2017-08-28 15:01:38 +02:00
Marcin Grzejszczak
7b144df594 Cannot set fixed port in mvn stub runner (httpPort is ignored)
without this change the value of `spring.cloud.contract.verifier.http.port` gets executed via the `httpPort` method in options builder. The problem is that this method applies the port to the previously started stub. In this case we're not providing any stubs explicitly thus things don't work as they should.

with this change we reuse the min / max port mechanism to limit the range of port to the provided http port

fixes #384
2017-08-28 14:55:40 +02:00
Marcin Grzejszczak
edfb851f29 Merge branch '1.1.x' 2017-08-28 14:10:21 +02:00
Marcin Grzejszczak
e4806b7797 Fixed wrong docs 2017-08-28 14:08:03 +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
8c3cf95ea2 Merge branch 'master' into 2.0.x 2017-08-25 15:00:15 +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
f08edcf495 Removed deprecated api 2017-08-25 13:15:41 +02:00
Marcin Grzejszczak
3ee80fa23e Merge branch 'master' into 2.0.x 2017-08-24 15:45:14 +02:00
Marcin Grzejszczak
17981653ee Merge branch '1.1.x' 2017-08-24 15:45:03 +02:00
Marcin Grzejszczak
04372d9ee4 Added information about Spring Cloud CLI 2017-08-24 15:44:42 +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
6b5b3a880e Merge branch 'master' into 2.0.x 2017-08-22 17:46:41 +02:00
Marcin Grzejszczak
a1839450fb Merge branch '1.1.x' 2017-08-22 17:40:59 +02:00
Marcin Grzejszczak
13bc6aa93c Removed unnecessary gson dep fixes #58 2017-08-22 17:40:48 +02:00
Marcin Grzejszczak
040f6b5105 Merge branch 'master' into 2.0.x 2017-08-22 16:47:19 +02:00
Marcin Grzejszczak
5b4c677fad Merge branch '1.1.x' 2017-08-22 16:47:11 +02:00
Marcin Grzejszczak
8ba58d3ab8 Ensure that /tmp files get removed upon process termination
fixes #359
2017-08-22 16:16:25 +02:00
Marcin Grzejszczak
0b3233fd03 Bumped maven samples 2017-08-21 12:56:19 +02:00
Marcin Grzejszczak
7f2833a868 Bumped Gradle plugin version in samples 2017-08-21 12:35:44 +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
9df0a18344 Added gradle substitution property 2017-08-21 12:10:11 +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
32cc52a4c2 Spock tests don't have the proper static import
without this change the `org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat` was missing in Spock tests
with this change it is added and matchers work fine again

fixes #382
2017-08-18 18:02:29 +02:00
Marcin Grzejszczak
d28bf396bc Merge branch 'master' into 2.0.x 2017-08-18 17:42:06 +02:00
Marcin Grzejszczak
4f028b8eb8 Merge branch '1.1.x' 2017-08-18 17:41:45 +02:00
Marcin Grzejszczak
8af5134b28 Fixed javadocs #378 2017-08-18 17:41:36 +02:00
Marcin Grzejszczak
d974ab19fc Merge branch 'master' into 2.0.x 2017-08-18 17:39:40 +02:00
Marcin Grzejszczak
3e6800727e Made the StubRunnerRule API more clear
without this change you can first set a port of a dependency at any time - which is wrong
with this change you can set a port only if you have first picked a dependency

fixes #366
2017-08-18 17:39:17 +02:00
Marcin Grzejszczak
c50eef3082 Merge branch 'master' into 2.0.x 2017-08-18 14:58:18 +02:00
Marcin Grzejszczak
a223ee39b1 Spring Integration Stub Messages shouldn't be @Component annotated 2017-08-18 14:58:08 +02:00