tests/qg-xxx: тесты переведены на новый RestTestClient

Так как он проще в отладке и чуть быстрее

Author: d-r-q

app/src/test/kotlin/pro/qyoga/tests/cases/app/publc/surveys/SubmitSurveyTest.kt

@@ -19,7 +19,7 @@ import pro.qyoga.tests.fixture.object_mothers.survey_forms.SurveyFormsSettingsOb
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_ADMIN_LOGIN
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
 import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseKoTest
-import pro.qyoga.tests.infra.web.mainWebTestClient
+import pro.qyoga.tests.infra.web.mainRestTestClient
 import tools.jackson.databind.JsonNode
 import tools.jackson.databind.node.ObjectNode
 import tools.jackson.module.kotlin.jacksonObjectMapper
@@ -28,7 +28,7 @@ import tools.jackson.module.kotlin.jacksonObjectMapper
 @DisplayName("Операция создания анкеты")
 class SubmitSurveyTest : QYogaAppIntegrationBaseKoTest({
 
-    val yandexFormsClient by lazy { YandexFormsClient(mainWebTestClient) }
+    val yandexFormsClient by lazy { YandexFormsClient(mainRestTestClient) }
 
     "при отправке новым клиентом корректного запроса со всеми значениями карточки должна" - {
         // Сетап

app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/GoogleAuthorizationIntegrationTest.kt

@@ -20,7 +20,7 @@ import pro.qyoga.tests.fixture.wiremocks.MockGoogleOAuthServer
 import pro.qyoga.tests.infra.test_config.spring.context
 import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseKoTest
 import pro.qyoga.tests.infra.wiremock.WireMock
-import pro.qyoga.tests.platform.spring.web_test_client.redirectLocation
+import pro.qyoga.tests.platform.spring.rest_test_client.redirectLocation
 
 
 @DisplayName("Интеграция с Google OAuth")

app/src/test/kotlin/pro/qyoga/tests/clients/TherapistClient.kt

@@ -8,21 +8,21 @@ import io.restassured.module.kotlin.extensions.When
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.springframework.http.HttpStatus
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.client.RestTestClient
 import pro.qyoga.tests.clients.api.*
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_LOGIN
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_PASSWORD
-import pro.qyoga.tests.infra.web.mainWebTestClient
+import pro.qyoga.tests.infra.web.mainRestTestClient
 
 
 class TherapistClient(
     val authCookie: Cookie,
-    webTestClient: WebTestClient = mainWebTestClient
+    restTestClient: RestTestClient = mainRestTestClient
 ) {
 
     // Work
     val appointments = TherapistAppointmentsApi(authCookie)
-    val googleCalendarIntegration = TherapistGoogleCalendarIntegrationApi(authCookie, webTestClient)
+    val googleCalendarIntegration = TherapistGoogleCalendarIntegrationApi(authCookie, restTestClient)
     val clients = TherapistClientsApi(authCookie)
     val clientJournal = TherapistClientJournalApi(authCookie)
     val clientFiles = TherapistClientFilesApi(authCookie)

app/src/test/kotlin/pro/qyoga/tests/clients/YandexFormsClient.kt

@@ -3,14 +3,14 @@ package pro.qyoga.tests.clients
 import org.springframework.http.HttpStatus
 import org.springframework.http.HttpStatusCode
 import org.springframework.http.ResponseEntity
-import org.springframework.test.web.reactive.server.WebTestClient
-import org.springframework.test.web.reactive.server.returnResult
+import org.springframework.test.web.servlet.client.RestTestClient
+import org.springframework.test.web.servlet.client.returnResult
 import pro.azhidkov.platform.spring.http.ErrorResponse
 import pro.qyoga.app.publc.surverys.SurveysController
 
 
 class YandexFormsClient(
-    private val client: WebTestClient
+    private val client: RestTestClient
 ) {
 
     fun createSurvey(surveyJsonStr: String): HttpStatusCode {
@@ -26,16 +26,15 @@ class YandexFormsClient(
         return createSurveyForResponse(entranceSurveyJsonStr)
             .expectStatus().isEqualTo(expectedStatus)
             .returnResult(ErrorResponse::class.java)
-            .responseBody
-            .blockFirst()!!
+            .responseBody!!
     }
 
-    fun createSurveyForResponse(entranceSurveyJsonStr: String): WebTestClient.ResponseSpec {
+    fun createSurveyForResponse(entranceSurveyJsonStr: String): RestTestClient.ResponseSpec {
         return client
             .post()
             .uri(SurveysController.PATH)
-            .bodyValue(entranceSurveyJsonStr)
+            .body(entranceSurveyJsonStr)
             .exchange()
     }
 
-}
+}

app/src/test/kotlin/pro/qyoga/tests/clients/api/AuthorizedApi.kt

@@ -2,7 +2,7 @@ package pro.qyoga.tests.clients.api
 
 import io.restassured.http.Cookie
 import io.restassured.specification.RequestSpecification
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.client.RestTestClient
 
 
 interface AuthorizedApi {
@@ -13,8 +13,8 @@ interface AuthorizedApi {
         return cookie(authCookie)
     }
 
-    fun WebTestClient.RequestHeadersSpec<*>.authorized(): WebTestClient.RequestHeadersSpec<*> {
+    fun RestTestClient.RequestHeadersSpec<*>.authorized(): RestTestClient.RequestHeadersSpec<*> {
         return cookie(authCookie.name, authCookie.value)
     }
 
-}
+}

app/src/test/kotlin/pro/qyoga/tests/clients/api/NotificationsApi.kt

@@ -3,16 +3,16 @@ package pro.qyoga.tests.clients.api
 import io.restassured.http.Cookie
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.client.RestTestClient
 import pro.qyoga.app.therapist.appointments.core.schedule.settings.NotificationsSettingsController
-import pro.qyoga.tests.infra.web.mainWebTestClient
-import pro.qyoga.tests.platform.spring.web_test_client.getBodyAsString
+import pro.qyoga.tests.infra.web.mainRestTestClient
+import pro.qyoga.tests.platform.spring.rest_test_client.getBodyAsString
 
 object NotificationsApiFactory {
 
     fun therapistApi(
         principal: Cookie,
-    ) = NotificationsTherapistApi(principal, mainWebTestClient)
+    ) = NotificationsTherapistApi(principal, mainRestTestClient)
 
 }
 
@@ -22,11 +22,11 @@ val TrainerAdvisorApis.Notifications
 
 class NotificationsTherapistApi(
     override val authCookie: Cookie,
-    private val webTestClient: WebTestClient
+    private val restTestClient: RestTestClient
 ) : AuthorizedApi {
 
     fun getNotificationsSettings(): Document {
-        return webTestClient.get()
+        return restTestClient.get()
             .uri(NotificationsSettingsController.PATH)
             .authorized()
             .exchange()

app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistGoogleCalendarIntegrationApi.kt

@@ -4,21 +4,20 @@ import io.restassured.http.Cookie
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse
-import org.springframework.test.web.reactive.server.WebTestClient
-import org.springframework.web.reactive.function.BodyInserters.fromValue
+import org.springframework.test.web.servlet.client.RestTestClient
 import pro.qyoga.app.therapist.appointments.core.schedule.settings.GoogleCalendarSettingsController
 import pro.qyoga.i9ns.calendars.google.model.GoogleAccountRef
-import pro.qyoga.tests.platform.spring.web_test_client.getBodyAsString
-import pro.qyoga.tests.platform.spring.web_test_client.redirectLocation
+import pro.qyoga.tests.platform.spring.rest_test_client.getBodyAsString
+import pro.qyoga.tests.platform.spring.rest_test_client.redirectLocation
 import java.net.URI
 
 class TherapistGoogleCalendarIntegrationApi(
     override val authCookie: Cookie,
-    private val webTestClient: WebTestClient
+    private val restTestClient: RestTestClient
 ) : AuthorizedApi {
 
     fun authorizeInGoogle(): URI {
-        val response = webTestClient.get()
+        val response = restTestClient.get()
             .uri("/oauth2/authorization/google")
             .authorized()
             .exchange()
@@ -33,8 +32,8 @@ class TherapistGoogleCalendarIntegrationApi(
     //           scope=https://www.googleapis.com/auth/calendar.readonly' \
     fun handleOAuthCallbackForResponse(
         authResponse: OAuth2AuthorizationResponse
-    ): WebTestClient.ResponseSpec {
-        return webTestClient.get()
+    ): RestTestClient.ResponseSpec {
+        return restTestClient.get()
             .uri {
                 it.path("/therapist/oauth2/google/callback")
                     .queryParam("state", authResponse.state)
@@ -45,15 +44,15 @@ class TherapistGoogleCalendarIntegrationApi(
             .exchange()
     }
 
-    fun finalizeOAuthCallbackForResponse(): WebTestClient.ResponseSpec {
-        return webTestClient.get()
+    fun finalizeOAuthCallbackForResponse(): RestTestClient.ResponseSpec {
+        return restTestClient.get()
             .uri("/therapist/oauth2/google/callback")
             .authorized()
             .exchange()
     }
 
     fun getGoogleCalendarComponent(): Document {
-        return webTestClient.get()
+        return restTestClient.get()
             .uri(GoogleCalendarSettingsController.PATH)
             .authorized()
             .exchange()
@@ -67,9 +66,9 @@ class TherapistGoogleCalendarIntegrationApi(
             "shouldBeShown" to shouldBeShown
         )
 
-        webTestClient.patch()
+        restTestClient.patch()
             .uri(GoogleCalendarSettingsController.updateCalendarSettingsPath(googleAccount, calendarId))
-            .body(fromValue(body))
+            .body(body)
             .authorized()
             .exchange()
             .expectStatus().isNoContent

app/src/test/kotlin/pro/qyoga/tests/clients/api/WebPushesPublicApi.kt

@@ -1,19 +1,19 @@
 package pro.qyoga.tests.clients.api
 
 import io.restassured.http.Cookie
-import org.springframework.test.web.reactive.server.WebTestClient
-import org.springframework.test.web.reactive.server.returnResult
+import org.springframework.test.web.servlet.client.RestTestClient
+import org.springframework.test.web.servlet.client.returnResult
 import pro.qyoga.app.publc.pushes.web.PushesPublicKeyController
-import pro.qyoga.tests.infra.web.mainWebTestClient
+import pro.qyoga.tests.infra.web.mainRestTestClient
 
 
 object WebPushesApiFactory {
 
-    val publicApi = WebPushesPublicApi(mainWebTestClient)
+    val publicApi = WebPushesPublicApi(mainRestTestClient)
 
     fun therapistApi(
         principal: Cookie,
-    ) = WebPushesTherapistApi(principal, mainWebTestClient)
+    ) = WebPushesTherapistApi(principal, mainRestTestClient)
 
 }
 
@@ -22,7 +22,7 @@ val TrainerAdvisorApis.WebPushes
     get() = WebPushesApiFactory
 
 class WebPushesPublicApi(
-    private val client: WebTestClient
+    private val client: RestTestClient
 ) {
 
     fun getPublicKey(): String {
@@ -31,8 +31,7 @@ class WebPushesPublicApi(
             .exchange()
             .expectStatus().isOk
             .returnResult<String>()
-            .responseBody
-            .blockFirst() ?: ""
+            .responseBody ?: ""
     }
 
 }

app/src/test/kotlin/pro/qyoga/tests/clients/api/WebPushesTherapistApi.kt

@@ -1,27 +1,26 @@
 package pro.qyoga.tests.clients.api
 
 import io.restassured.http.Cookie
-import org.springframework.test.web.reactive.server.WebTestClient
-import org.springframework.web.reactive.function.BodyInserters.fromValue
+import org.springframework.test.web.servlet.client.RestTestClient
 import pro.qyoga.app.pushes.web.WebPushesController
 import pro.qyoga.i9ns.pushes.web.model.WebPushSubscription
 
 class WebPushesTherapistApi(
     override val authCookie: Cookie,
-    private val webTestClient: WebTestClient
+    private val restTestClient: RestTestClient
 ) : AuthorizedApi {
 
     fun createSubscription(subscription: WebPushSubscription) {
-        webTestClient.post()
+        restTestClient.post()
             .uri(WebPushesController.PATH)
-            .body(fromValue(subscription))
+            .body(subscription)
             .authorized()
             .exchange()
             .expectStatus().isNoContent
     }
 
     fun deleteSubscription(p256dh: String) {
-        webTestClient.delete()
+        restTestClient.delete()
             .uri(WebPushesController.DELETE_SUBSCRIPTION_PATH, p256dh)
             .authorized()
             .exchange()

app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/RestTestClient.kt

@@ -0,0 +1,22 @@
+package pro.qyoga.tests.infra.web
+
+import org.apache.hc.client5.http.impl.classic.HttpClients
+import org.springframework.context.ConfigurableApplicationContext
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory
+import org.springframework.test.web.servlet.client.RestTestClient
+import pro.qyoga.tests.infra.test_config.spring.baseUrl
+
+
+val mainRestTestClient: RestTestClient by lazy { createRestTestClient() }
+
+fun createRestTestClient(context: ConfigurableApplicationContext = pro.qyoga.tests.infra.test_config.spring.context): RestTestClient =
+    RestTestClient.bindToServer(
+        HttpComponentsClientHttpRequestFactory(
+            HttpClients.custom()
+                .disableRedirectHandling()
+                .build()
+        )
+    )
+        .baseUrl(context.baseUrl)
+        .defaultHeader("Content-Type", "application/json;charset=UTF-8")
+        .build()