From 1de6b63c52326c2059f13cbe4dd36e392d7e20f3 Mon Sep 17 00:00:00 2001 From: im-na0 <139189221+im-na0@users.noreply.github.com> Date: Thu, 13 Jun 2024 20:24:57 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9E=98=EB=AA=BB=EB=90=9C=20path=20ali?= =?UTF-8?q?as=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ui/typo/typo.tsx | 2 +- src/mocks/handlers/payment.ts | 4 ++-- src/mocks/handlers/room.ts | 7 ++++--- src/pages/roomDetailPage/RoomDetailMap.tsx | 4 +++- .../searchPage/components/searchItem/SearchItem.tsx | 2 +- src/types/searchList.ts | 2 +- tests/e2eTests/global.setup.ts | 3 ++- tests/e2eTests/specs/authentication/register.spec.ts | 2 +- tests/unitTestsSrc/VerificationPage.spec.tsx | 9 +++++---- tests/unitTestsSrc/useEmailVerification.spec.tsx | 7 ++++--- 10 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/components/ui/typo/typo.tsx b/src/components/ui/typo/typo.tsx index ce812759..8b12feb2 100644 --- a/src/components/ui/typo/typo.tsx +++ b/src/components/ui/typo/typo.tsx @@ -10,7 +10,7 @@ import { import type { PolymorphicComponentPropsWithRef, PolymorphicRef, -} from "@components/ui/polymorphic"; +} from "../polymorphic"; export type TextProps = PolymorphicComponentPropsWithRef; diff --git a/src/mocks/handlers/payment.ts b/src/mocks/handlers/payment.ts index e92f3b77..e993a1b3 100644 --- a/src/mocks/handlers/payment.ts +++ b/src/mocks/handlers/payment.ts @@ -1,6 +1,6 @@ import { BASE_URL, END_POINTS } from "@/constants/api"; -import dummyPaymentInfo from "@mocks/data/dummyPaymentInfo.json"; -import dummyPaymentSuccess from "@mocks/data/dummyPaymentSuccess.json"; +import dummyPaymentInfo from "@/mocks/data/dummyPaymentInfo.json"; +import dummyPaymentSuccess from "@/mocks/data/dummyPaymentSuccess.json"; import { http, HttpResponse } from "msw"; export const paymentHandler = [ diff --git a/src/mocks/handlers/room.ts b/src/mocks/handlers/room.ts index af23ed02..3da9fd07 100644 --- a/src/mocks/handlers/room.ts +++ b/src/mocks/handlers/room.ts @@ -1,8 +1,9 @@ -import { BASE_URL, END_POINTS } from "@/constants/api"; -import dummyRoomDetail from "@mocks/data/dummyRoomDetail.json"; -import dummyStock from "@mocks/data/dummyStock.json"; import { http, HttpResponse } from "msw"; +import { BASE_URL, END_POINTS } from "@/constants/api"; +import dummyRoomDetail from "@/mocks/data/dummyRoomDetail.json"; +import dummyStock from "@/mocks/data/dummyStock.json"; + const roomHandlers = [ http.get(BASE_URL + END_POINTS.ROOM(":productId"), () => { return HttpResponse.json(dummyRoomDetail); diff --git a/src/pages/roomDetailPage/RoomDetailMap.tsx b/src/pages/roomDetailPage/RoomDetailMap.tsx index 5e9e516c..2a8beb1b 100644 --- a/src/pages/roomDetailPage/RoomDetailMap.tsx +++ b/src/pages/roomDetailPage/RoomDetailMap.tsx @@ -1,14 +1,15 @@ -import IconMapPin from "@/assets/icons/ic_map-pin.svg?react"; import { useSuspenseQuery } from "@tanstack/react-query"; import { useEffect, useRef } from "react"; import { useSearchParams } from "react-router-dom"; import styled from "styled-components"; import { getGeoCoder } from "@/apis/map"; +import IconMapPin from "@/assets/icons/ic_map-pin.svg?react"; import { ColorKeys, TypoKeys } from "@/styles/theme"; declare global { interface Window { + // eslint-disable-next-line @typescript-eslint/no-explicit-any kakao: any; } } @@ -50,6 +51,7 @@ export default function RoomDetailMaps() { const map = new window.kakao.maps.Map(container, options); + // eslint-disable-next-line @typescript-eslint/no-unused-vars const marker = new window.kakao.maps.Marker({ map: map, position, diff --git a/src/pages/searchPage/components/searchItem/SearchItem.tsx b/src/pages/searchPage/components/searchItem/SearchItem.tsx index 78ebdf54..ef5ed5f0 100644 --- a/src/pages/searchPage/components/searchItem/SearchItem.tsx +++ b/src/pages/searchPage/components/searchItem/SearchItem.tsx @@ -1,10 +1,10 @@ -import { PATH } from "@/constants/path"; import { format, parseISO } from "date-fns"; import { useNavigate } from "react-router-dom"; import * as S from "./SearchItem.style"; import ProgressiveImg from "@/components/progressiveImg/ProgressiveImg"; +import { PATH } from "@/constants/path"; import { ISearchList } from "@/types/searchList"; const SearchItem = ({ item }: { item: ISearchList }) => { diff --git a/src/types/searchList.ts b/src/types/searchList.ts index e4147763..ab2a4fcf 100644 --- a/src/types/searchList.ts +++ b/src/types/searchList.ts @@ -1,5 +1,5 @@ export interface ISearchList { - id: string; + id: number; name: string; roomType: string; imageUrl: string; diff --git a/tests/e2eTests/global.setup.ts b/tests/e2eTests/global.setup.ts index 3261c843..a49567ff 100644 --- a/tests/e2eTests/global.setup.ts +++ b/tests/e2eTests/global.setup.ts @@ -1,5 +1,6 @@ import { chromium, FullConfig } from "@playwright/test"; -import { LoginPage } from "@tests/e2eTests/models/LoginPage.ts"; + +import { LoginPage } from "./models/LoginPage"; async function globalSetup(config: FullConfig) { const { storageState } = config.projects[1].use; diff --git a/tests/e2eTests/specs/authentication/register.spec.ts b/tests/e2eTests/specs/authentication/register.spec.ts index f9ad9087..33ed597b 100644 --- a/tests/e2eTests/specs/authentication/register.spec.ts +++ b/tests/e2eTests/specs/authentication/register.spec.ts @@ -1,5 +1,5 @@ import { test } from "@playwright/test"; -import { Signup } from "@tests/e2eTests/models/SignupPage"; +import { Signup } from "tests/e2eTests/models/SignupPage"; test.use({ storageState: { cookies: [], origins: [] } }); diff --git a/tests/unitTestsSrc/VerificationPage.spec.tsx b/tests/unitTestsSrc/VerificationPage.spec.tsx index cfe751e4..df9dab16 100644 --- a/tests/unitTestsSrc/VerificationPage.spec.tsx +++ b/tests/unitTestsSrc/VerificationPage.spec.tsx @@ -1,12 +1,13 @@ -import { getEmailVerification } from "@mocks/handlers/email.ts"; -import { server } from "@mocks/server.ts"; -import VerificationPage from "@/pages/connectYanoljaPage/verificationPage/VerificationPage.tsx"; -import { theme } from "@/styles/theme.ts"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { fireEvent, render, screen, waitFor } from "@testing-library/react"; import { MemoryRouter } from "react-router-dom"; import { ThemeProvider } from "styled-components"; +import { getEmailVerification } from "@/mocks/handlers/email.ts"; +import { server } from "@/mocks/server.ts"; +import VerificationPage from "@/pages/connectYanoljaPage/verificationPage/VerificationPage.tsx"; +import { theme } from "@/styles/theme.ts"; + beforeAll(() => server.listen()); afterEach(() => { server.resetHandlers(); diff --git a/tests/unitTestsSrc/useEmailVerification.spec.tsx b/tests/unitTestsSrc/useEmailVerification.spec.tsx index 1b27d192..7bda0a47 100644 --- a/tests/unitTestsSrc/useEmailVerification.spec.tsx +++ b/tests/unitTestsSrc/useEmailVerification.spec.tsx @@ -1,9 +1,10 @@ -import { useValidateEmailMutation } from "@/hooks/api/useValidateEmailMutation.ts"; -import { getEmailVerification } from "@mocks/handlers/email.ts"; -import { server } from "@mocks/server.ts"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { act, renderHook, waitFor } from "@testing-library/react"; +import { useValidateEmailMutation } from "@/hooks/api/useValidateEmailMutation.ts"; +import { getEmailVerification } from "@/mocks/handlers/email.ts"; +import { server } from "@/mocks/server.ts"; + const queryClient = new QueryClient({ defaultOptions: { queries: {