From 84b0cc6478defca096da30892d8f628357786402 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 30 May 2017 13:23:03 +0200 Subject: [PATCH] Checking if the root project has .idea folder fixes #286 --- .../plugin/SpringCloudContractVerifierGradlePlugin.groovy | 2 +- .../stubrunner/provider/moco/MocoHttpServerStubSpec.groovy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy index 180ac604ef..ec0fadaec4 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy @@ -68,7 +68,7 @@ class SpringCloudContractVerifierGradlePlugin implements Plugin { } private addIdeaTestSources(Project project, extension) { - def hasIdea = new File(project.projectDir, ".idea").exists() + def hasIdea = new File(project.rootDir, ".idea").exists() if (hasIdea) { project.apply(plugin: 'idea') project.idea { diff --git a/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStubSpec.groovy b/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStubSpec.groovy index 2889ab29f7..5cbf274f11 100644 --- a/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStubSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStubSpec.groovy @@ -36,7 +36,7 @@ import spock.lang.Specification /** * @author Marcin Grzejszczak */ -@ContextConfiguration(classes = Config, loader = SpringBootContextLoader) +@ContextConfiguration(classes = MocoConfig, loader = SpringBootContextLoader) // tag::[classpath_stub_runner] @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) // to use stubs from classpath just provide ids without passing any other properties to @@ -75,7 +75,7 @@ class MocoHttpServerStubSpec extends Specification { @Configuration @EnableAutoConfiguration @EnableBinding(Sink.class) - static class Config { + static class MocoConfig { @Bean MyListener myListener() {