Merge branch '1.2.x'

This commit is contained in:
Marcin Grzejszczak
2018-02-12 17:09:31 +01:00
6 changed files with 11 additions and 11 deletions

View File

@@ -14,7 +14,7 @@
<name>spring-cloud-contract-dependencies</name>
<description>Spring Cloud Contract Dependencies</description>
<properties>
<wiremock.version>2.14.0</wiremock.version>
<wiremock.version>2.15.0</wiremock.version>
<jsonassert.version>0.4.11</jsonassert.version>
<aether.version>1.0.2.v20150114</aether.version>
</properties>

View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.14.0
wiremockVersion=2.15.0
jsonAssertVersion=0.4.11
verifierVersion=2.0.0.BUILD-SNAPSHOT

View File

@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.14.0
wiremockVersion=2.15.0
jsonAssertVersion=0.4.11
verifierVersion=2.0.0.BUILD-SNAPSHOT

View File

@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.14.0
wiremockVersion=2.15.0
jsonAssertVersion=0.4.11
verifierVersion=2.0.0.BUILD-SNAPSHOT

View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.14.0
wiremockVersion=2.15.0
jsonAssertVersion=0.4.11
verifierVersion=2.0.0.BUILD-SNAPSHOT

View File

@@ -398,9 +398,9 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie
headers {
header "Content-Type", "customtype/xml"
}
body """<name>${value(consumer('Jozo'), producer('Denis'))}</name><jobId>${
body """<foo><name>${value(consumer('Jozo'), producer('Denis'))}</name><jobId>${
value(consumer("<test>"), producer('1234567890'))
}</jobId>"""
}</jobId></foo>"""
}
response {
status 200
@@ -421,7 +421,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie
},
"bodyPatterns": [
{
"equalToXml":"<name>Jozo</name><jobId>&lt;test&gt;</jobId>"
"equalToXml":"<foo><name>Jozo</name><jobId>&lt;test&gt;</jobId></foo>"
}
]
},
@@ -549,9 +549,9 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie
request {
method 'GET'
url "/users"
body equalToXml("""<name>${value(consumer('Jozo'), producer('Denis'))}</name><jobId>${
body equalToXml("""<foo><name>${value(consumer('Jozo'), producer('Denis'))}</name><jobId>${
value(consumer("<test>"), producer('1234567890'))
}</jobId>""")
}</jobId></foo>""")
}
response {
status 200
@@ -567,7 +567,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie
"url": "/users",
"bodyPatterns": [
{
"equalToXml":"<name>Jozo</name><jobId>&lt;test&gt;</jobId>"
"equalToXml":"<foo><name>Jozo</name><jobId>&lt;test&gt;</jobId></foo>"
}
]
},