isRequiredBy overload accepting TaskProvider instead of Task Fixes #208

avast · Nov 18, 2019 · f31fe91 · f31fe91
1 parent 951286f
commit f31fe91
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy
@@ -163,6 +163,10 @@ class ComposeSettings {
         if (task instanceof JavaForkOptions) task.doFirst { exposeAsSystemProperties(task as JavaForkOptions) }
     }
 
+    void isRequiredBy(TaskProvider<Task> taskProvider) {
+        taskProvider.configure { isRequiredBy(it) }
+    }
+
     Map<String, ServiceInfo> getServicesInfos() {
         upTask.get().servicesInfos
     }

diff --git a/src/test/groovy/com/avast/gradle/dockercompose/DockerComposePluginTest.groovy b/src/test/groovy/com/avast/gradle/dockercompose/DockerComposePluginTest.groovy
@@ -116,6 +116,18 @@ class DockerComposePluginTest extends Specification {
             task.getFinalizedBy().getDependencies(task).any { it == project.tasks.composeDown }
     }
 
+    def "isRequiredBy() adds dependencies when using TaskProvider"() {
+        def project = ProjectBuilder.builder().build()
+        project.plugins.apply 'docker-compose'
+        TaskProvider<Task> taskProvider = project.tasks.register('integrationTest')
+        when:
+        project.dockerCompose.isRequiredBy(taskProvider)
+        Task task = taskProvider.get()
+        then:
+        task.dependsOn.find { it instanceof TaskProvider && ((TaskProvider)it).get() == project.tasks.composeUp }
+        task.getFinalizedBy().getDependencies(task).any { it == project.tasks.composeDown }
+    }
+
     def "isRequiredBy() adds dependencies for nested settings"() {
         def project = ProjectBuilder.builder().build()
         project.plugins.apply 'docker-compose'