test: rebase 후 실패하는 테스트 수정

petqua · Feb 5, 2024 · a927542 · a927542
1 parent 58397b4
commit a927542
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/test/kotlin/com/petqua/presentation/auth/AuthControllerTest.kt b/src/test/kotlin/com/petqua/presentation/auth/AuthControllerTest.kt
@@ -21,6 +21,7 @@ import java.util.Date
 class AuthControllerTest(
     private val memberRepository: MemberRepository,
     private val refreshTokenRepository: RefreshTokenRepository,
+    private val authTokenProvider: AuthTokenProvider,
 ) : ApiTestConfig() {
 
     init {

diff --git a/src/test/kotlin/com/petqua/presentation/product/WishProductControllerTest.kt b/src/test/kotlin/com/petqua/presentation/product/WishProductControllerTest.kt
@@ -14,7 +14,6 @@ import io.restassured.module.kotlin.extensions.Extract
 import io.restassured.module.kotlin.extensions.Given
 import io.restassured.module.kotlin.extensions.Then
 import io.restassured.module.kotlin.extensions.When
-import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus.NO_CONTENT
 import org.springframework.http.HttpStatus.OK
 import org.springframework.http.MediaType
@@ -28,7 +27,7 @@ class WishProductControllerTest(
 
     init {
         Given("찜 상품 수정을") {
-            val memberAuthResponse = signInAsMember()
+            val accessToken = signInAsMember().accessToken
             val product = productRepository.save(product())
             val request = UpdateWishRequest(
                 productId = product.id
@@ -38,7 +37,7 @@ class WishProductControllerTest(
                 val response = Given {
                     log().all()
                         .body(request)
-                        .header(HttpHeaders.AUTHORIZATION, memberAuthResponse.accessToken)
+                        .auth().preemptive().oauth2(accessToken)
                         .contentType(MediaType.APPLICATION_JSON_VALUE)
                 } When {
                     post("/products/wishes")
@@ -55,25 +54,26 @@ class WishProductControllerTest(
         }
 
         Given("찜 목록 조회를") {
-            val memberAuthResponse = signInAsMember()
+            val accessToken = signInAsMember().accessToken
+            val memberId = getMemberIdByAccessToken(accessToken)
             val store = storeRepository.save(store())
             val (product1, product2, product3) = saveProducts(productRepository, store)
             wishProductRepository.save(
                 WishProduct(
                     productId = product1.id,
-                    memberId = getMemberIdFromAuthResponse(memberAuthResponse)
+                    memberId = memberId
                 )
             )
             wishProductRepository.save(
                 WishProduct(
                     productId = product2.id,
-                    memberId = getMemberIdFromAuthResponse(memberAuthResponse)
+                    memberId = memberId
                 )
             )
             wishProductRepository.save(
                 WishProduct(
                     productId = product3.id,
-                    memberId = getMemberIdFromAuthResponse(memberAuthResponse)
+                    memberId = memberId
                 )
             )
 
@@ -82,7 +82,7 @@ class WishProductControllerTest(
                     log().all()
                         .param("lastViewedId", -1L)
                         .param("limit", 20)
-                        .header(HttpHeaders.AUTHORIZATION, memberAuthResponse.accessToken)
+                        .auth().preemptive().oauth2(accessToken)
                 } When {
                     get("/products/wishes")
                 } Then {

diff --git a/src/test/kotlin/com/petqua/test/ApiTestConfig.kt b/src/test/kotlin/com/petqua/test/ApiTestConfig.kt
@@ -1,6 +1,6 @@
 package com.petqua.test
 
-import com.petqua.domain.auth.token.AuthTokenProvider
+import com.petqua.presentation.auth.AuthExtractor
 import com.petqua.presentation.auth.AuthResponse
 import com.petqua.test.config.OauthTestConfig
 import io.kotest.core.spec.style.BehaviorSpec
@@ -27,7 +27,8 @@ abstract class ApiTestConfig() : BehaviorSpec() {
     private lateinit var dataCleaner: DataCleaner
 
     @Autowired
-    protected lateinit var authTokenProvider: AuthTokenProvider
+    protected lateinit var authExtractor: AuthExtractor
+
 
     init {
         this.beforeTest {
@@ -39,8 +40,8 @@ abstract class ApiTestConfig() : BehaviorSpec() {
         }
     }
 
-    final fun getMemberIdFromAuthResponse(authResponse: AuthResponse): Long {
-        return authTokenProvider.getAccessTokenClaimsOrThrow(authResponse.accessToken).memberId
+    final fun getMemberIdByAccessToken(accessToken: String): Long {
+        return authExtractor.getAccessTokenClaimsOrThrow(accessToken).memberId
     }
 
     final fun signInAsMember(): AuthResponse {