Converted request body to a equalTo matcher

This commit is contained in:
Marcin Grzejszczak
2015-02-21 23:33:15 +01:00
parent f8fd03288f
commit a908d2e3f2
3 changed files with 12 additions and 4 deletions

View File

@@ -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)))

View File

@@ -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<String, Object> 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<String, Object> appendUrl(ClientRequest clientRequest) {
@@ -33,4 +33,9 @@ class WiremockRequestStubStrategy extends BaseWiremockStubStrategy {
return url instanceof Pattern ? [urlPattern: ((Pattern)url).pattern()] : [url: url]
}
private Map<String, Object> appendBody(ClientRequest clientRequest) {
Object body = clientRequest?.body?.clientValue
return body != null ? [body: [equalTo: body]] : [:]
}
}

View File

@@ -141,7 +141,9 @@ class WiremockGroovyDslSpec extends Specification {
"method": "GET",
"urlPattern": "/[0-9]{2}",
"body": {
"name": "Jan"
"equalTo": {
"name": "Jan"
}
}
},
"response": {