Commit Graph

2662 Commits

Author SHA1 Message Date
Marcin Grzejszczak
6fcb61eca4 I give up 2019-02-18 10:56:02 +01:00
Marcin Grzejszczak
c004737816 Polish 2019-02-18 10:44:56 +01:00
Marcin Grzejszczak
d72aada46c Polish 2019-02-18 10:27:59 +01:00
Marcin Grzejszczak
b733a718a4 Restarting WireMock stubs when reusing servers running on random ports 2019-02-18 10:17:45 +01:00
Marcin Grzejszczak
d7f39c1a80 Polish 2019-02-18 09:29:03 +01:00
Marcin Grzejszczak
9ce1b0374d Polish 2019-02-18 09:20:24 +01:00
Marcin Grzejszczak
6383285265 Polish 2019-02-18 09:17:00 +01:00
boothen
11965323ae #883: Wiremock: Fix for Spring context always being set to Dirty. (#884)
* #883: Using boolean values in Wiremock.server so that it's possible to identify if dynamic ports have been configured.

* #883: Triage feedback. Added  @author. Updated license year. Changed test name.

* #883: Fixed portIsFixed logic. Added test to check expect port status to applicable tests. @DirtiesContext to test so that context is cleared down to avoid conflict in the next test.

* #883: Removed duplicate portIsFixed/portIsNotFixed unit tests.

* #883: Checkstyle fixes.
2019-02-17 17:22:00 +01:00
Marcin Grzejszczak
38782b9260 Added missing import 2019-02-16 13:00:45 +01:00
Marcin Grzejszczak
41b764e758 Polish 2019-02-16 12:52:10 +01:00
Marcin Grzejszczak
6602b3891b Merge branch '2.0.x' 2019-02-16 12:51:43 +01:00
Marcin Grzejszczak
a34a24765f Fixed the broken build 2019-02-16 12:47:54 +01:00
Marcin Grzejszczak
a84fc81919 Merge branch '2.0.x' 2019-02-15 17:49:15 +01:00
Marcin Grzejszczak
b167e364c5 Sets the generated test sources under java source set or groovy for Spock; fixes gh-888 2019-02-15 17:46:15 +01:00
Marcin Grzejszczak
f4475f44b7 Merge branch '2.0.x' 2019-02-14 14:11:51 +01:00
Marcin Grzejszczak
f7ea8f0241 Request param not accepting empty values; fixes gh-886 2019-02-14 14:10:10 +01:00
Olga Maciaszek-Sharma
4ec1f68919 Reformat readme comment. 2019-02-13 15:55:22 +01:00
Olga Maciaszek-Sharma
2e0bb76820 Fix authors in file. 2019-02-13 13:38:03 +01:00
Olga Maciaszek-Sharma
d9a3762ab2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContentUtils.groovy
#	spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/ContentUtilsSpec.groovy
2019-02-13 13:27:55 +01:00
Olga Maciaszek-Sharma
60dd61e332 Merge branch '2.0.x'
# Conflicts:
#	docker/spring-cloud-contract-docker/Dockerfile
#	docker/spring-cloud-contract-stub-runner-docker/Dockerfile
#	spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContentUtils.groovy
2019-02-13 13:23:31 +01:00
Olga Maciaszek-Sharma
431dd7aabb Minor refactoring. 2019-02-13 13:16:57 +01:00
konstantinshevchuk
59954d1da0 Default handler for XmlSlurper (#879)
* Default handler for XmlSlurper
2019-02-13 13:02:05 +01:00
Marcin Grzejszczak
8bbe6945ce Merge branch '2.0.x' 2019-02-12 10:48:22 +01:00
Marcin Grzejszczak
d27020bfdf Updated sdkman java version 2019-02-12 10:48:14 +01:00
Marcin Grzejszczak
8ce80e6e7f Applied checkstyle rules 2019-02-08 18:20:59 +01:00
Marcin Grzejszczak
8610626e60 Added recursive check for empty arrays; fixes gh-727 2019-01-29 11:27:08 +01:00
buildmaster
0cb549b8e7 Bumping versions 2019-01-25 14:01:10 +00:00
Marcin Grzejszczak
d65886e035 Updated code for 2.1.x version 2019-01-24 17:57:46 +01:00
Marcin Grzejszczak
13ce788acf Merge branch '2.0.x' 2019-01-24 17:55:18 +01:00
Marcin Grzejszczak
e8f774f874 Fixed the unnecessary isEmpty generation; fixes gh-727 2019-01-24 17:55:04 +01:00
Marcin Grzejszczak
55f648fc85 Migrated to non snapshot versions for classpath tests 2019-01-23 11:00:12 +01:00
buildmaster
6597c6eec2 Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 2019-01-22 20:46:19 +00:00
buildmaster
1314163825 Going back to snapshots 2019-01-22 20:46:18 +00:00
buildmaster
cd239d8c39 Update SNAPSHOT to 2.1.0.RELEASE 2019-01-22 20:39:11 +00:00
Marcin Grzejszczak
d8f5986115 Removed snapshot versions 2019-01-22 20:31:10 +01:00
Marcin Grzejszczak
8ebc749d2f Fixed the way regex entries are generated for message bodies; fixes gh-858 2019-01-22 09:14:08 +01:00
Marcin Grzejszczak
a2d6137340 Fixed the way regex entries are generated for message bodies
fixes gh-858
2019-01-22 09:13:16 +01:00
Marcin Grzejszczak
38b1ebae2f Added a test case for message and regex; fixes gh-858 2019-01-22 08:44:51 +01:00
Marcin Grzejszczak
9561627003 Updated JDK in Docker images 2019-01-22 08:15:17 +01:00
Marcin Grzejszczak
42329bcacb Updated JDK in Docker images 2019-01-22 08:14:53 +01:00
Olga Maciaszek-Sharma
313d5ef586 Fix WebFlux usage section in docs. Remove unused method (#857)
Remove unused method and implementation for processing xml body verification (class is package-
scope, so not backwards incompatible change).
2019-01-21 18:51:35 +01:00
Marcin Grzejszczak
414404d0ae Intellij is hanging all the time 2019-01-21 16:52:36 +01:00
Marcin Grzejszczak
941e56cdce Bumped Build 2019-01-21 14:13:09 +01:00
Marcin Grzejszczak
281bd653ae Bumped Boot to 2.1.2.RELEASE 2019-01-21 13:34:49 +01:00
Marcin Grzejszczak
d41d79b887 Added javadocs 2019-01-20 22:42:36 +01:00
Marcin Grzejszczak
0d0d2ea11c Shouldn't always parse each object
without this change, when a body is parsed and it contains a JSON in a JSON, then we parse it. That's because our logic hasn't actually ever considered that one can have a valid JSON string in a JSON.

with this change we're introducing a parsing closure. When we know that the body is a Map and we know that we're parsing a JSON, then we don't want to parse any Strings inside that map. We assume that the users know what they do, so if an element in the map is a String, then we just pass it.

fixes gh-652
2019-01-20 22:23:34 +01:00
Marcin Grzejszczak
1eed5c606d Merge branch '2.0.x' 2019-01-20 20:33:57 +01:00
Marcin Grzejszczak
fb1e081dda Added a test and docs on how to add all stubs from the classpath; fixes gh-591 2019-01-20 20:33:49 +01:00
Marcin Grzejszczak
d50ddf15c5 Merge branch '2.0.x' 2019-01-20 13:06:15 +01:00
Marcin Grzejszczak
7f1b14a292 Escaping new lines for json; fixes gh-802 2019-01-20 13:05:08 +01:00