Commit Graph

304 Commits

Author SHA1 Message Date
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
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
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
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
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
Marcin Grzejszczak
f37869e348 Spring Integration Stub Messages shouldn't be @Component annotated 2017-08-18 14:57:48 +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
b9921f942f Merge branch 'master' into 2.0.x 2017-07-31 11:57:57 +02:00
Marcin Grzejszczak
5a37733878 Merge branch '1.1.x' 2017-07-31 11:57:48 +02:00
Cástor Rodríguez
3b44533905 Test generation to place queryParameters before async on RestAssured when chain (#373)
fixes #372
2017-07-31 11:57:06 +02:00
Marcin Grzejszczak
735797cc39 Merge branch 'master' into 2.0.x 2017-07-31 10:09:42 +02:00
Marcin Grzejszczak
7e97c8a690 Merge branch '1.1.x' 2017-07-31 10:09:13 +02:00
Rocks360
1727041400 Support for generic top level domain .online in the email regular expression (#371)
* Refactor email regular expression to support email addresses ending with .online

fixes #367
2017-07-31 10:03:49 +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
f11d5a1153 Merge branch 'master' into 2.0.x 2017-07-17 23:11:10 +02:00
Marcin Grzejszczak
395107b3e8 Merge branch '1.1.x' 2017-07-17 23:10:54 +02:00
Felipe Adorno
421b669361 Tests fail to compile when the contract contains a long value (#358)
without this change when a contract contains a long value inside the body, then the code fails to compile since the provided number is assumed to be an integer.
with this change we're appending an L literal to that value for the compiler to assume that it's a long value.
2017-07-17 22:35:37 +02:00
Marcin Grzejszczak
e28e346f77 Merge branch 'master' into 2.0.x 2017-07-13 12:22:21 +02:00
Marcin Grzejszczak
654127302e Merge branch '1.1.x' 2017-07-13 12:10:32 +02:00
Marcin Grzejszczak
0f91efffd3 Fixed the way we treat headers and matching strategies
fixes #353
2017-07-13 12:09:27 +02:00
Marcin Grzejszczak
2d7055560f Going back to snapshots 2017-06-29 08:34:29 +02:00
Marcin Grzejszczak
76e47bfdec Update SNAPSHOT to 2.0.0.M1 2017-06-29 08:24:17 +02:00
Marcin Grzejszczak
6816b08e0c Merge branch 'master' into 2.0.x 2017-06-28 15:04:28 +02:00
Marcin Grzejszczak
7890e75328 Merge branch '1.1.x' 2017-06-28 15:04:18 +02:00
Marcin Grzejszczak
99deaad17e Contracts path cannot be overriden
without this change there's no way to change the default path of the path to the contracts when trying to execute the convert / generateTests task for another project
with this change we're setting properly the `spring.cloud.contract.verifier.contractsDirectory` for both tasks

fixes #338
2017-06-28 14:45:33 +02:00
Marcin Grzejszczak
0789875608 Merge branch 'master' into 2.0.x 2017-06-28 12:47:36 +02:00
Marcin Grzejszczak
828590b476 Merge branch '1.1.x' 2017-06-28 12:47:27 +02:00
Marcin Grzejszczak
aa68196b27 Added tests for #336
fixes #336
2017-06-28 12:46:56 +02:00
Marcin Grzejszczak
e96234d7c0 Merge branch 'master' into 2.0.x 2017-06-28 11:47:15 +02:00
Marcin Grzejszczak
4611a49ed9 Merge branch '1.1.x' 2017-06-28 11:47:01 +02:00
Marcin Grzejszczak
36409ac400 Fixing the way queue binding key gets used for rabbit listener
without this change we're very strict in terms of the number of called send methods on the rabbittemplate
with this change we accept that the method could have been called more than once

fixes #332
2017-06-28 11:46:22 +02:00
Marcin Grzejszczak
f37eb63a1a Merge branch 'master' into 2.0.x 2017-06-26 18:28:33 +02:00
Marcin Grzejszczak
7be2d8dad5 Bumped rest assured to 3.0
fixes #267
2017-06-26 18:15:39 +02:00
Marcin Grzejszczak
e8142b4b43 Merge branch 'master' into 2.0.x 2017-06-26 11:38:57 +02:00
Marcin Grzejszczak
a58461f1c0 Bumped libs
WireMock to 2.6.0
 Boot to 1.5.5.BUILD-SNAPSHOT
 jopt to 5.0.3
 spock global unroll to 0.5.1
 hoverfly to 0.2.2
 commons3 to 3.6

fixes #317
2017-06-26 11:01:55 +02:00
Marcin Grzejszczak
b1710ff74c Removed deprecations 2017-06-23 15:18:33 +02:00
Marcin Grzejszczak
2eef44b04a Merge branch 'master' into 2.0.x 2017-06-23 14:36:50 +02:00
Marcin Grzejszczak
22e2284256 Removed deprecations 2017-06-23 14:36:43 +02:00