pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: TestAuthUtil에서 회원 로그인 시에도 Pair<UserEntity, Token> 반환 수정 및 반영

Browse Source
This commit is contained in:
이상진 2025-09-18 16:23:26 +09:00
parent 48b4a7597f
commit 45813fc04d
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/kotlin/roomescape/schedule/AdminScheduleApiTest.kt
View File

@ -41,7 +41,7 @@ class AdminScheduleApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.GET, method = HttpMethod.GET,
endpoint = "/admin/stores/${INVALID_PK}/schedules", endpoint = "/admin/stores/${INVALID_PK}/schedules",
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -203,7 +203,7 @@ class AdminScheduleApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.GET, method = HttpMethod.GET,
endpoint = "/admin/schedules/${INVALID_PK}/audits", endpoint = "/admin/schedules/${INVALID_PK}/audits",
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -298,7 +298,7 @@ class AdminScheduleApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.POST, method = HttpMethod.POST,
endpoint = "/admin/stores/${INVALID_PK}/schedules", endpoint = "/admin/stores/${INVALID_PK}/schedules",
requestBody = ScheduleFixture.createRequest, requestBody = ScheduleFixture.createRequest,
@ -451,7 +451,7 @@ class AdminScheduleApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.PATCH, method = HttpMethod.PATCH,
endpoint = "/admin/schedules/${INVALID_PK}", endpoint = "/admin/schedules/${INVALID_PK}",
requestBody = ScheduleUpdateRequest(), requestBody = ScheduleUpdateRequest(),
@ -582,7 +582,7 @@ class AdminScheduleApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.DELETE, method = HttpMethod.DELETE,
endpoint = "/admin/schedules/${INVALID_PK}", endpoint = "/admin/schedules/${INVALID_PK}",
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED

4
src/test/kotlin/roomescape/schedule/ScheduleApiTest.kt
View File

@ -90,7 +90,7 @@ class ScheduleApiTest(
val schedule = dummyInitializer.createSchedule() val schedule = dummyInitializer.createSchedule()
runTest( runTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
on = { on = {
post("/schedules/${schedule.id}/hold") post("/schedules/${schedule.id}/hold")
}, },
@ -109,7 +109,7 @@ class ScheduleApiTest(
val schedule = dummyInitializer.createSchedule(status = it) val schedule = dummyInitializer.createSchedule(status = it)
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.POST, method = HttpMethod.POST,
endpoint = "/schedules/${schedule.id}/hold", endpoint = "/schedules/${schedule.id}/hold",
expectedErrorCode = ScheduleErrorCode.SCHEDULE_NOT_AVAILABLE expectedErrorCode = ScheduleErrorCode.SCHEDULE_NOT_AVAILABLE

6
src/test/kotlin/roomescape/supports/TestAuthUtil.kt
View File

@ -91,7 +91,7 @@ class TestAuthUtil(
fun defaultStoreAdminLogin(): Pair<AdminEntity, String> = adminLogin(AdminFixture.storeDefault) fun defaultStoreAdminLogin(): Pair<AdminEntity, String> = adminLogin(AdminFixture.storeDefault)
fun defaultHqAdminLogin(): Pair<AdminEntity, String> = adminLogin(AdminFixture.hqDefault) fun defaultHqAdminLogin(): Pair<AdminEntity, String> = adminLogin(AdminFixture.hqDefault)
fun userLogin(user: UserEntity): String { fun userLogin(user: UserEntity): Pair<UserEntity, String> {
println("[TestAuthUtil] 회원 로그인 시작. id=${user.id}, email=${user.email}") println("[TestAuthUtil] 회원 로그인 시작. id=${user.id}, email=${user.email}")
if (userRepository.findByEmail(user.email) == null) { if (userRepository.findByEmail(user.email) == null) {
println("[TestAuthUtil] 회원 정보 없음. 회원 생성 시작. email=${user.email}") println("[TestAuthUtil] 회원 정보 없음. 회원 생성 시작. email=${user.email}")
@ -109,10 +109,10 @@ class TestAuthUtil(
path("data.accessToken") path("data.accessToken")
} }
return token.also { println("[TestAuthUtil] 회원 로그인 완료. id=${user.id}, email=${user.email}") } return user to token.also { println("[TestAuthUtil] 회원 로그인 완료. id=${user.id}, email=${user.email}") }
} }
fun defaultUserLogin(): String = userLogin(UserFixture.default) fun defaultUserLogin(): Pair<UserEntity, String> = userLogin(UserFixture.default)
fun defaultUser(): UserEntity = userRepository.findByEmail(UserFixture.default.email) fun defaultUser(): UserEntity = userRepository.findByEmail(UserFixture.default.email)
?: userRepository.save(UserFixture.default) ?: userRepository.save(UserFixture.default)

12
src/test/kotlin/roomescape/theme/AdminThemeApiTest.kt
View File

@ -39,7 +39,7 @@ class AdminThemeApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.POST, method = HttpMethod.POST,
requestBody = createRequest, requestBody = createRequest,
endpoint = endpoint, endpoint = endpoint,
@ -246,7 +246,7 @@ class AdminThemeApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.GET, method = HttpMethod.GET,
requestBody = createRequest, requestBody = createRequest,
endpoint = endpoint, endpoint = endpoint,
@ -295,7 +295,7 @@ class AdminThemeApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.GET, method = HttpMethod.GET,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -359,7 +359,7 @@ class AdminThemeApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.GET, method = HttpMethod.GET,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -448,7 +448,7 @@ class AdminThemeApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.DELETE, method = HttpMethod.DELETE,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -527,7 +527,7 @@ class AdminThemeApiTest(
test("회원") { test("회원") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultUserLogin(), token = testAuthUtil.defaultUserLogin().second,
method = HttpMethod.PATCH, method = HttpMethod.PATCH,
endpoint = endpoint, endpoint = endpoint,
requestBody = request, requestBody = request,

3
src/test/kotlin/roomescape/user/UserApiTest.kt
View File

@ -154,8 +154,7 @@ class UserApiTest(
} }
test("정상 응답") { test("정상 응답") {
val user = testAuthUtil.defaultUser() val (user, token) = testAuthUtil.defaultUserLogin()
val token = testAuthUtil.userLogin(user)
runTest( runTest(
token = token, token = token,