chore: upgrade to Spring Boot 2.2.2 and Kotlin 1.3.61

Ninja-Squad · Dec 6, 2019 · dcd71cd · dcd71cd
1 parent a7ab9dc
commit dcd71cd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -14,15 +14,15 @@ buildscript {
 }
 
 plugins {
-    val kotlinVersion = "1.3.50"
+    val kotlinVersion = "1.3.61"
 
     java
     jacoco
     kotlin("jvm") version kotlinVersion
     id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
     id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
     id("org.jetbrains.kotlin.plugin.noarg") version kotlinVersion
-    id("org.springframework.boot") version "2.2.1.RELEASE"
+    id("org.springframework.boot") version "2.2.2.RELEASE"
     id("io.spring.dependency-management") version "1.0.8.RELEASE"
     id("org.flywaydb.flyway") version "6.0.4"
     id("com.gorylenko.gradle-git-properties") version "2.0.0"

diff --git a/backend/src/test/kotlin/org/globe42/web/persons/PersonFileControllerMvcTest.kt b/backend/src/test/kotlin/org/globe42/web/persons/PersonFileControllerMvcTest.kt
@@ -9,7 +9,6 @@ import org.globe42.storage.FileDTO
 import org.globe42.storage.ReadableFile
 import org.globe42.storage.StorageService
 import org.globe42.test.GlobeMvcTest
-import org.globe42.web.test.asyncDispatch
 import org.globe42.web.test.jsonValue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -83,7 +82,7 @@ class PersonFileControllerMvcTest(@Autowired private val mvc: MockMvc) {
         }
         every { mockStorageService.get(directory, theFile.name)} returns readableFile
 
-        mvc.get("/api/persons/{personId}/files/{name}", person.id, theFile.name).asyncDispatch(mvc).andExpect {
+        mvc.get("/api/persons/{personId}/files/{name}", person.id, theFile.name).asyncDispatch().andExpect {
             status { isOk }
             header { longValue(HttpHeaders.CONTENT_LENGTH, 5L) }
             content {

diff --git a/backend/src/test/kotlin/org/globe42/web/test/MockMvcDsl.kt b/backend/src/test/kotlin/org/globe42/web/test/MockMvcDsl.kt
@@ -11,11 +11,3 @@ fun MockMvcResultMatchersDsl.jsonValue(expression: String, value: Any?) {
         jsonPath(expression) { value(it) }
     } ?: jsonPath(expression, CoreMatchers.nullValue())
 }
-
-fun ResultActionsDsl.asyncDispatch(mockMvc: MockMvc): ResultActionsDsl {
-    return this.andExpect {
-        request { asyncStarted() }
-    }.andReturn().let {
-        ResultActionsDsl(mockMvc.perform(MockMvcRequestBuilders.asyncDispatch(it)))
-    }
-}