From baf294dbbf416ce9795da6248f39b4c11442b053 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 31 May 2017 16:14:06 +0200 Subject: [PATCH] Updated the contracts --- .../verifier/builder/MockMvcMethodBodyBuilderSpec.groovy | 8 ++++---- .../contract/verifier/dsl/WireMockGroovyDslSpec.groovy | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy index 3da84bf9cb..8bf4cce37c 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy @@ -1184,9 +1184,9 @@ World.'''""" // `name` and `content`. You can also call `named("fileName", "fileContent")` file: named( // name of the file - name: $(c(regex('.+')), p('filename.csv')), + name: $(c(regex(nonEmpty())), p('filename.csv')), // content of the file - content: $(c(regex('.+')), p('file content'))) + content: $(c(regex(nonEmpty())), p('file content'))) ) } response { @@ -1235,9 +1235,9 @@ World.'''""" // `name` and `content`. You can also call `named("fileName", "fileContent")` file: named( // name of the file - name: $(c(regex('.+')), p('filename.csv')), + name: $(c(regex(nonEmpty())), p('filename.csv')), // content of the file - content: $(c(regex('.+')), p('file content'))) + content: $(c(regex(nonEmpty())), p('file content'))) ) } response { diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy index 9dba75e00e..13c6dd06fd 100755 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy @@ -1517,9 +1517,9 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie // a parameter name (e.g. file) file: named( // name of the file - name: $(c(regex('.+')), p('filename.csv')), + name: $(c(regex(nonEmpty())), p('filename.csv')), // content of the file - content: $(c(regex('.+')), p('file content'))) + content: $(c(regex(nonEmpty())), p('file content'))) ) } response {