First cut Integration Test using REST-Assured. Also modifed .gitignore for Mac.
This commit is contained in:
@@ -17,3 +17,4 @@ repos
|
|||||||
*.iws
|
*.iws
|
||||||
rebel.xml
|
rebel.xml
|
||||||
*.sublime-workspace
|
*.sublime-workspace
|
||||||
|
*.DS_Store
|
||||||
|
|||||||
@@ -160,7 +160,8 @@ dependencies {
|
|||||||
|
|
||||||
testCompile 'junit:junit:4.10',
|
testCompile 'junit:junit:4.10',
|
||||||
'org.mockito:mockito-all:1.9.0',
|
'org.mockito:mockito-all:1.9.0',
|
||||||
'org.hamcrest:hamcrest-all:1.1'
|
'org.hamcrest:hamcrest-all:1.1',
|
||||||
|
'com.jayway.restassured:rest-assured:1.7.2'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -210,6 +211,24 @@ tomcatRunWar {
|
|||||||
configFile = file('src/test/resources/META-INF/context.xml')
|
configFile = file('src/test/resources/META-INF/context.xml')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
integrationTest {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
integrationTestCompile.extendsFrom testCompile
|
||||||
|
integrationTestRuntime.extendsFrom testRuntime
|
||||||
|
}
|
||||||
|
|
||||||
|
task integrationTest(type:Test){
|
||||||
|
description = "Run integration tests (located in src/integrationTest/java). Requires server to be running."
|
||||||
|
testClassesDir = project.sourceSets.integrationTest.output.classesDir
|
||||||
|
classpath = project.sourceSets.integrationTest.runtimeClasspath
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Support publication of artifacts versioned by topic branch.
|
* Support publication of artifacts versioned by topic branch.
|
||||||
* CI builds supply `-P BRANCH_NAME=<TOPIC>` to gradle at build time.
|
* CI builds supply `-P BRANCH_NAME=<TOPIC>` to gradle at build time.
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user