diff --git a/backend/build.gradle b/backend/build.gradle index 5dcea9c1b..d382fe156 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -7,7 +7,6 @@ plugins { id 'io.franzbecker.gradle-lombok' version '1.13' id 'com.palantir.docker' version '0.20.1' id 'com.palantir.docker-run' version '0.20.1' - id 'com.avast.gradle.docker-compose' version '0.8.0' } apply plugin: 'io.spring.dependency-management' @@ -307,20 +306,4 @@ docker { files tasks.bootJar.outputs files 'src/main/docker-files/loader.properties' buildArgs(['JAR_FILE': "shibui-${version}.jar"]) -} - -/* - * Docker Compose (gradle-docker-compose-plugin) settings. - * Used to start and stop docker containers before running tests. - */ -apply plugin: 'docker-compose' -dockerCompose { - useComposeFiles = ['./src/test/docker-files/docker-compose.yml'] - captureContainersOutput = true - waitForTcpPorts = false -} - -test { - dependsOn 'composeUp' - finalizedBy 'composeDown' -} +} \ No newline at end of file diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy index a1640322d..399edde0d 100644 --- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy +++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy @@ -13,6 +13,7 @@ import spock.lang.Unroll import java.nio.file.Paths +//TODO: make config configurable @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = [ShibbolethUiApplication]) @ActiveProfiles(['dev']) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD, methodMode = DirtiesContext.MethodMode.AFTER_METHOD)