Commit Graph

1746 Commits

Author SHA1 Message Date
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
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
Jay Bryant
2e9459d740 Proofreading pass (#417)
I proofread the documentation and made it more formal.
2017-09-09 09:09:31 +02:00
Marcin Grzejszczak
bd2f863fdf Merge branch '1.1.x' 2017-09-05 14:19:19 +02:00
Marcin Grzejszczak
e6b80d619e Fixed missing $.body element in pact matchers; fixes #414 2017-09-05 14:19:12 +02:00
Marcin Grzejszczak
db642f8849 Merge branch '1.1.x' 2017-09-04 13:29:29 +02:00
Marcin Grzejszczak
4adde109fd Trying to make surefire work 2017-09-04 13:29:19 +02:00
Marcin Grzejszczak
28e8df2ad7 Merge branch '1.1.x' 2017-09-04 12:34:52 +02:00
Marcin Grzejszczak
d92dbf09ee Fixed Non empty and non blank regex patterns
also catching ClassNotFoundError and printing it in trace level

fixes #412
2017-09-04 12:16:33 +02:00
Marcin Grzejszczak
ec6cd20467 Bumped WireMock to 2.8.0, fixes #410 2017-09-04 11:53:46 +02:00
Marcin Grzejszczak
15cd85540c Updated docs about fromRequest().path() fixes #411 2017-09-04 11:40:33 +02:00
Marcin Grzejszczak
343109af7e Removed escaping unicode chars; fixes #385 2017-09-04 11:27:05 +02:00
Marcin Grzejszczak
5f8fd5058c Added support for fromRequest.path
without this change you can't referrence path of the request in the response
with this change that functionality is added

also Removed lang3 dependency and changed it to commons-text

fixes #388
2017-09-01 17:22:28 +02:00
Marcin Grzejszczak
4c08408e66 DslProperty doesn't get resolved in WireMock stub headers
without this change we're using directly the clientSide value of the DslProperty, whereas it can be nested
with this change we resolve the final value of the DslProperty

fixes #408
2017-09-01 16:46:56 +02:00
Marcin Grzejszczak
38028b5b07 Merge branch '1.1.x' 2017-09-01 14:39:00 +02:00
Marcin Grzejszczak
d9fe4ac307 Adding note in the docs about Stubrunner and messaging; fixes #407 2017-09-01 14:38:51 +02:00
Marcin Grzejszczak
a6f22bc593 Merge branch '1.1.x' 2017-09-01 11:10:31 +02:00
Marcin Grzejszczak
6d321c697d Fixed classcast in sc-WireMock; fixes #399 2017-09-01 11:10:24 +02:00
Marcin Grzejszczak
bf0159dbc7 Merge branch '1.1.x' 2017-08-31 14:47:05 +02:00
Marcin Grzejszczak
2043548e4d Added missing links 2017-08-31 14:46:58 +02:00
Marcin Grzejszczak
385a09f456 Merge branch '1.1.x' 2017-08-31 14:42:59 +02:00
Marcin Grzejszczak
fd04b8a370 Referrencing resources from sc-build 2017-08-31 14:42:53 +02:00
Marcin Grzejszczak
2777b98485 Merge branch '1.1.x' 2017-08-30 16:40:04 +02:00
Marcin Grzejszczak
babd671e32 Rebalanced docs; fixes #403 2017-08-30 16:31:47 +02:00
Marcin Grzejszczak
cd4555d4af Merge branch '1.1.x' 2017-08-30 13:40:08 +02:00
Marcin Grzejszczak
5cbf1836f0 Fixed checkstyole 2017-08-30 13:26:40 +02:00
Marcin Grzejszczak
15021d3bd1 Added the missing .timeout(...) method in the generated RestAssured tests
without this change the `fixedDelayMilliseconds` only works for the stub but doesn't do anything in the generated test
with this change we're adding this functionality for MockMvc based tests

fixes #402
2017-08-30 13:02:21 +02: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
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
d015169382 Merge branch '1.1.x' 2017-08-29 09:59:27 +02:00
Marcin Grzejszczak
587a0c37a0 New docs; fixes #395 2017-08-29 09:53:47 +02:00
Marcin Grzejszczak
93d66f9f2f Bumped libs' 2017-08-29 09:24:29 +02:00
Marcin Grzejszczak
af1cfc6848 Bumped libs 2017-08-29 09:23:24 +02:00
Marcin Grzejszczak
a2dddff057 Bumped libs 2017-08-29 08:57:07 +02:00
Marcin Grzejszczak
e48a29297a Merge branch '1.1.x' 2017-08-28 17:31:09 +02:00
Marcin Grzejszczak
8975aee9a8 Using testMatchers in DSL other than byRegex adds unsolicited isEmpty check for an array
The converted body looks different when done via the String notation than it does when done via a map notation. When working with String body and when matchers are provided, even when all entries of a map / list got removed, the map / list itself remains. That leads to unnecessary creation of checks for empty collection. With this method we're checking if the JSON path matcher is related to array checking and we're trying to remove that trailing collection. All in all it's better to use the Groovy based notation for defining body...

fixes #391
2017-08-28 17:31:05 +02:00
WhyINeedToFillUsername
08f20afd91 Updated description of byType testMatcher (#394)
fixes #393
2017-08-28 16:27:03 +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
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
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