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

Bumped wiremock to 2.16.0; fixes gh-600

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-03-31 18:43:39 +02:00
parent 766cd59f64
commit 9aa1eab483
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-contract-dependencies/pom.xml
View File

@@ -14,7 +14,7 @@
<name>spring-cloud-contract-dependencies</name>
<description>Spring Cloud Contract Dependencies</description>
<properties>
<wiremock.version>2.15.0</wiremock.version>
<wiremock.version>2.16.0</wiremock.version>
<jsonassert.version>0.4.11</jsonassert.version>
<aether.version>1.0.2.v20150114</aether.version>
<rest-assured.version>3.0.7</rest-assured.version>

2
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java
View File

@@ -71,7 +71,7 @@ public class ResourcesFileSource implements FileSource {
public BinaryFile getBinaryFileNamed(String name) {
for (FileSource resource : this.sources) {
try {
UrlResource uri = new UrlResource(resource.getBinaryFileNamed(name).getUri());
UrlResource uri = new UrlResource(resource.getUri());
if (uri.exists()) {
return resource.getBinaryFileNamed(name);
}

8
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java
View File

@@ -77,6 +77,14 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {
return this;
}
@Override public ScenarioMappingBuilder withQueryParams(
Map<String, StringValuePattern> queryParams) {
for (Map.Entry<String, StringValuePattern> entry : queryParams.entrySet()) {
this.requestPatternBuilder.withQueryParam(entry.getKey(), entry.getValue());
}
return this;
}
@Override public ScenarioMappingBuilder withRequestBody(
ContentPattern<?> bodyPattern) {
this.requestPatternBuilder.withRequestBody(bodyPattern);