Skip to content

Commit c86b7ad

Browse files
committed
refactor to execute multiples test classes
1 parent f6da910 commit c86b7ad

7 files changed

+224
-226
lines changed

functional-test/src/test/groovy/functional/BasicIntegrationSpec.groovy

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
package functional
22

3+
import functional.base.BaseTestConfiguration
34
import functional.util.TestUtil
45
import org.rundeck.client.api.model.JobRun
5-
import spock.lang.Shared
66
import org.testcontainers.spock.Testcontainers
77

88

99
@Testcontainers
10-
class BasicIntegrationSpec extends TestConfiguration {
11-
12-
@Shared
13-
public static RundeckCompose rundeckEnvironment = new RundeckCompose(new File("src/test/resources/docker/docker-compose.yml").toURI())
14-
10+
class BasicIntegrationSpec extends BaseTestConfiguration {
1511

1612
static String PROJ_NAME = 'ansible-test'
1713

1814
def setupSpec() {
19-
rundeckEnvironment.startCompose()
20-
client = rundeckEnvironment.configureRundeck(PROJ_NAME)
15+
startCompose()
16+
configureRundeck(PROJ_NAME)
2117
}
2218

2319
def "test simple inline playbook"(){

functional-test/src/test/groovy/functional/PluginGroupIntegrationSpec.groovy

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
package functional
22

3+
import functional.base.BaseTestConfiguration
34
import functional.util.TestUtil
4-
import org.rundeck.client.api.RundeckApi
55
import org.rundeck.client.api.model.JobRun
6-
import org.rundeck.client.util.Client
76
import org.testcontainers.spock.Testcontainers
8-
import spock.lang.Shared
97

108

119
@Testcontainers
12-
class PluginGroupIntegrationSpec extends TestConfiguration {
13-
14-
@Shared
15-
public static RundeckCompose rundeckEnvironment = new RundeckCompose(new File("src/test/resources/docker/docker-compose.yml").toURI())
16-
17-
@Shared
18-
Client<RundeckApi> client
10+
class PluginGroupIntegrationSpec extends BaseTestConfiguration {
1911

2012
static String PROJ_NAME = 'ansible-plugin-group-test'
2113

2214
def setupSpec() {
23-
rundeckEnvironment.startCompose()
24-
client = rundeckEnvironment.configureRundeck(PROJ_NAME)
15+
startCompose()
16+
configureRundeck(PROJ_NAME)
2517
}
2618

2719
def "test simple inline playbook"(){

functional-test/src/test/groovy/functional/RundeckCompose.groovy

-144
This file was deleted.

functional-test/src/test/groovy/functional/TestConfiguration.groovy

-62
This file was deleted.

0 commit comments

Comments
 (0)