diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy index 956e165239..1695856b27 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy @@ -22,6 +22,7 @@ class MethodBuilder { } static MethodBuilder createTestMethod(File stubsFile, TestFramework lang) { + log.debug("Stub content from file [${stubsFile.text}]") GroovyDsl stubContent = new GroovyShell(this.classLoader).evaluate(stubsFile) log.debug("Stub content Groovy DSL [$stubContent]") String methodName = NamesUtil.camelCase(NamesUtil.toLastDot(NamesUtil.afterLast(stubsFile.path, File.separator))) 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 index 7e18989e83..4ab842d6cd 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy @@ -1,4 +1,5 @@ package io.coderate.accurest.dsl + import groovy.transform.CompileStatic import groovy.transform.PackageScope import io.coderate.accurest.dsl.internal.ClientRequest @@ -23,9 +24,8 @@ class WiremockRequestStubStrategy extends BaseWiremockStubStrategy { private Map buildRequestContent(ClientRequest request) { return ([method : request?.method?.clientValue, - headers : buildClientHeadersSection(request.headers), - body : request?.body?.clientValue - ] << appendUrl(request)).findAll { it.value } + headers : buildClientHeadersSection(request.headers) + ] << appendUrl(request) << appendBody(request)).findAll { it.value } } private Map appendUrl(ClientRequest clientRequest) { @@ -33,4 +33,9 @@ class WiremockRequestStubStrategy extends BaseWiremockStubStrategy { return url instanceof Pattern ? [urlPattern: ((Pattern)url).pattern()] : [url: url] } + private Map appendBody(ClientRequest clientRequest) { + Object body = clientRequest?.body?.clientValue + return body != null ? [body: [equalTo: body]] : [:] + } + } 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 index 7b8a7ea5c9..14b6cd5952 100644 --- a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy @@ -141,7 +141,9 @@ class WiremockGroovyDslSpec extends Specification { "method": "GET", "urlPattern": "/[0-9]{2}", "body": { - "name": "Jan" + "equalTo": { + "name": "Jan" + } } }, "response": {