Skip to content

Commit

Permalink
[NOJIRA]
Browse files Browse the repository at this point in the history
remove unneeded configuration
add todo
  • Loading branch information
jj committed Mar 12, 2019
1 parent 7042689 commit b14fec1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 deletions.
19 changes: 1 addition & 18 deletions backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b14fec1

Please sign in to comment.