From 64fcac070f8be8e553487a9d877ddf49078cb389 Mon Sep 17 00:00:00 2001 From: Catalin Buleandra Date: Sat, 21 Mar 2015 22:04:38 +0100 Subject: [PATCH] Wiremock stubs should have the body defined under bodyPatterns, and not body. --- .../accurest/wiremock/DslToWiremockClientConverterSpec.groovy | 2 +- .../io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy | 2 +- .../io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy | 2 +- .../io/codearte/accurest/plugin/BasicFunctionalSpec.groovy | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverterSpec.groovy mode change 100644 => 100755 accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy mode change 100644 => 100755 accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy mode change 100644 => 100755 accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy diff --git a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverterSpec.groovy b/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverterSpec.groovy old mode 100644 new mode 100755 index 1f1a105142..f753cc6bf4 --- a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverterSpec.groovy +++ b/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverterSpec.groovy @@ -84,7 +84,7 @@ class DslToWiremockClientConverterSpec extends Specification { "request":{ "method":"PUT", "url":"/api/12", - "body": { + "bodyPatterns": { "equalTo": "[{\\"created_at\\":\\"Sat Jul 26 09:38:57 +0000 2014\\",\\"id\\":492967299297845248,\\"id_str\\":\\"492967299297845248\\",\\"place\\":{\\"attributes\\":{},\\"bounding_box\\":{\\"coordinates\\":[[[-77.119759,38.791645],[-76.909393,38.791645],[-76.909393,38.995548],[-77.119759,38.995548]]],\\"type\\":\\"Polygon\\"},\\"country\\":\\"United States\\",\\"country_code\\":\\"US\\",\\"full_name\\":\\"Washington, DC\\",\\"id\\":\\"01fbe706f872cb32\\",\\"name\\":\\"Washington\\",\\"place_type\\":\\"city\\",\\"url\\":\\"http://api.twitter.com/1/geo/id/01fbe706f872cb32.json\\"},\\"text\\":\\"Gonna see you at Warsaw\\"}]" }, "headers": { diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy old mode 100644 new mode 100755 index d32919aa6c..885c53483b --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy @@ -39,7 +39,7 @@ class WiremockRequestStubStrategy extends BaseWiremockStubStrategy { private Map appendBody(ClientRequest clientRequest) { Object body = clientRequest?.body?.clientValue - return body != null ? [body: [equalTo: parseBody(body)]] : [:] + return body != null ? [bodyPatterns: [equalTo: parseBody(body)]] : [:] } private String parseBody(Object responseBodyObject) { diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy old mode 100644 new mode 100755 index 75c0e17cfb..f849bc717d --- a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy @@ -140,7 +140,7 @@ class WiremockGroovyDslSpec extends Specification { "request": { "method": "GET", "urlPattern": "/[0-9]{2}", - "body": { + "bodyPatterns": { "equalTo":"{\\"name\\":\\"Jan\\"}" } }, diff --git a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy old mode 100644 new mode 100755 index 05385ea28a..d1b3d976bd --- a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy +++ b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy @@ -51,7 +51,7 @@ class BasicFunctionalSpec extends IntegrationSpec { } }, "url": "/api/12", - "body": { + "bodyPatterns": { "equalTo": "[{\\"text\\":\\"Gonna see you at Warsaw\\"}]" } },