From 5713fd15bf8eec6c476acc7436920d82b214a180 Mon Sep 17 00:00:00 2001 From: Jakub Kubrynski Date: Sat, 21 Feb 2015 18:02:29 +0100 Subject: [PATCH] Extended sample groovy dsl with placeholders --- .../accurest/builder/SpockMethodBodyBuilder.groovy | 2 ++ .../src/test/resources/dsl/basic/sampleDsl.groovy | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/builder/SpockMethodBodyBuilder.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/builder/SpockMethodBodyBuilder.groovy index 79cdf0998e..05f8a632ac 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/builder/SpockMethodBodyBuilder.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/builder/SpockMethodBodyBuilder.groovy @@ -44,6 +44,8 @@ class SpockMethodBodyBuilder { blockBuilder.addLine("response.header('$it.key') == '$it.value'") } if (stubDefinition.response.body) { + blockBuilder.endBlock() + blockBuilder.addLine('and:').startBlock() blockBuilder.addLine('def responseBody = new JsonSlurper().parseText(response.body.asString())') stubDefinition.response.body.serverValue.each { def value = it.value diff --git a/accurest-core/src/test/resources/dsl/basic/sampleDsl.groovy b/accurest-core/src/test/resources/dsl/basic/sampleDsl.groovy index e0e69eef4a..40dc6494de 100644 --- a/accurest-core/src/test/resources/dsl/basic/sampleDsl.groovy +++ b/accurest-core/src/test/resources/dsl/basic/sampleDsl.groovy @@ -6,7 +6,8 @@ io.coderate.accurest.dsl.GroovyDsl.make { } body("""\ { - "name": "Jan" + "name": "Jan", + "id": "${value(client('abc'), server('def'))}", } """ ) @@ -16,10 +17,12 @@ io.coderate.accurest.dsl.GroovyDsl.make { status 200 body("""\ { - "name": "Jan" + "name": "Jan", + "id": "${value(client('123'), server('321'))}", + "surname": "${value(client('Kowalsky'), server('$checkIfSurnameValid($value)'))}" } """ - ) + ) headers { header 'Content-Type': 'text/plain' }