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

Merge branch '1.0.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-01-25 16:53:17 +01:00
parent 152d598bff e10a752c45
commit dc670f7f1f
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.adoc
View File

@@ -1315,6 +1315,7 @@ Example of a `pom.xml` inside the `server` folder.
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.0.4.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-dependencies.version>Camden.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
<excludeBuildFolders>true</excludeBuildFolders>
</properties>
<dependencyManagement>

6
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java
View File

@@ -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

1
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/src/test/resources/contracts/WithList.groovy
View File

@@ -15,6 +15,7 @@
* limitations under the License.
*/
org.springframework.cloud.contract.spec.Contract.make {
ignored()
request {
method 'POST'
url('/users') {

2
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JavaTestGenerator.groovy
View File

@@ -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))
}

1
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy
View File

@@ -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')