SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-11-22 22:44:23 +01:00
parent a752106959 8e7494add0
commit 763802d26d
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy
View File

@@ -73,7 +73,9 @@ class TestSideRequestTemplateModel {
private static List<String> buildPathsFromUrl(String url) {
String fakeUrl = "http://foo.bar" + (url.startsWith("/") ? url : "/" + url)
List<String> paths = new URL(fakeUrl).path.split("/") as List<String>
paths.remove(0)
if (!paths.isEmpty()) {
paths.remove(0)
}
return paths
}
@@ -84,7 +86,7 @@ class TestSideRequestTemplateModel {
private static String getBodyAsRawJson(Object body) {
Object bodyValue = extractServerValueFromBody(body)
return new JsonOutput().toJson(bodyValue)
return bodyValue != null ? new JsonOutput().toJson(bodyValue) : bodyValue
}
protected static Object extractServerValueFromBody(bodyValue) {

43
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy
View File

@@ -348,6 +348,49 @@ DocumentContext parsedJson = JsonPath.parse(json);
"JaxRsClientJUnitMethodBodyBuilder" | { Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl, properties) }
}
@Issue("#465")
def "should work for '/' url for [#methodBuilderName]"() {
given:
Contract contractDsl = Contract.make {
description("""
Represents a request to the shouldReturnName service
given:
a request to the shouldReturnName service
when:
it is a GET
then:
return Ryan
""")
request {
method 'GET'
url '/'
}
response {
status 200
body("Ryan")
headers {
contentType(textHtml())
}
}
}
MethodBodyBuilder builder = methodBuilder(contractDsl)
BlockBuilder blockBuilder = new BlockBuilder(" ")
when:
builder.appendTo(blockBuilder)
String test = blockBuilder.toString()
then:
SyntaxChecker.tryToCompileWithoutCompileStatic(methodBuilderName, test)
and:
stubMappingIsValidWireMockStub(contractDsl)
where:
methodBuilderName | methodBuilder
"MockMvcSpockMethodBuilder" | { Contract dsl -> new MockMvcSpockMethodRequestProcessingBodyBuilder(dsl, properties) }
"MockMvcJUnitMethodBuilder" | { Contract dsl -> new MockMvcJUnitMethodBodyBuilder(dsl, properties) }
"JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl, properties) }
"JaxRsClientJUnitMethodBodyBuilder" | { Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl, properties) }
}
def "should use fixed delay milliseconds in the generated test [#methodBuilderName]"() {
given:
Contract contractDsl = Contract.make {