diff --git a/README.adoc b/README.adoc index d6fae29283..958120fab1 100644 --- a/README.adoc +++ b/README.adoc @@ -1315,6 +1315,7 @@ Example of a `pom.xml` inside the `server` folder. 1.8 1.0.4.BUILD-SNAPSHOT Camden.BUILD-SNAPSHOT + true diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java index 412c0123b0..cbaeebe49b 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java @@ -73,8 +73,10 @@ public class PluginUnitTest { public void shouldGenerateContractSpecificationInDefaultLocation() throws Exception { File basedir = this.resources.getBasedir("basic"); this.maven.executeMojo(basedir, "generateTests", newParameter("testFramework", "SPOCK")); - assertFilesPresent(basedir, - "target/generated-test-sources/contracts/org/springframework/cloud/contract/verifier/tests/ContractVerifierSpec.groovy"); + String path = "target/generated-test-sources/contracts/org/springframework/cloud/contract/verifier/tests/ContractVerifierSpec.groovy"; + assertFilesPresent(basedir, path); + File test = new File(basedir, path); + then(FileUtils.readFileToString(test)).contains("spock.lang.Ignore"); } @Test diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/src/test/resources/contracts/WithList.groovy b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/src/test/resources/contracts/WithList.groovy index fe5ca5748a..4232f274d5 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/src/test/resources/contracts/WithList.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/src/test/resources/contracts/WithList.groovy @@ -15,6 +15,7 @@ * limitations under the License. */ org.springframework.cloud.contract.spec.Contract.make { + ignored() request { method 'POST' url('/users') { diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JavaTestGenerator.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JavaTestGenerator.groovy index c31b9278ea..b35aabfa5a 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JavaTestGenerator.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JavaTestGenerator.groovy @@ -97,8 +97,8 @@ class JavaTestGenerator implements SingleTestGenerator { addMessagingRelatedEntries(clazz) } conditionalImportsAdded = true - toIgnore = toIgnore ? true: key.groovyDsl.ignored } + toIgnore = toIgnore ? true : key.groovyDsl.ignored clazz.addMethod(MethodBuilder.createTestMethod(key.contract, key.stubsFile, key.groovyDsl, configProperties)) } diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy index 1da5d72524..1bcecfe1c4 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy @@ -213,6 +213,7 @@ class SingleTestGeneratorSpec extends Specification { File secondFile = tmpFolder.newFile() secondFile.write(""" org.springframework.cloud.contract.spec.Contract.make { + ignored() label 'some_label' input { messageFrom('delete')