Merge remote-tracking branch 'origin/develop' into feature/shibui-2274

TIER · Jun 14, 2022 · 86215f1 · 86215f1
2 parents a3acdd2 + f1e1193
commit 86215f1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -205,6 +205,9 @@ dependencies {
     integrationTestCompile 'jp.vmi:selenese-runner-java:3.20.0'
     integrationTestCompile "org.springframework.boot:spring-boot-starter-test:${project.'springbootVersion'}"
     integrationTestCompile "org.springframework.security:spring-security-test:${project.'springSecurityVersion'}"
+    integrationTestCompile platform("org.spockframework:spock-bom:2.1-groovy-3.0")
+    integrationTestCompile "org.spockframework:spock-core"
+    integrationTestCompile "org.spockframework:spock-spring"
 
     // CSV file support
     compile 'com.opencsv:opencsv:4.4', {
@@ -239,6 +242,7 @@ task copyUI(type: Copy) {
 }
 
 task integrationTest(type: Test) {
+    useJUnitPlatform()
     group = 'verification'
     description = 'Run various integration tests'
     dependsOn 'copyUI'
@@ -250,6 +254,7 @@ task integrationTest(type: Test) {
 }
 
 task enversTest(type: Test) {
+    useJUnitPlatform()
     group = 'verification'
     description = 'Run tests pertaing to envers versioning engine'
     testClassesDirs = sourceSets.enversTest.output.classesDirs