Skip to content

Commit

Permalink
fix: 잘못된 path alias 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
im-na0 committed Jun 13, 2024
1 parent 1122232 commit 1de6b63
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/components/ui/typo/typo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import type {
PolymorphicComponentPropsWithRef,
PolymorphicRef,
} from "@components/ui/polymorphic";
} from "../polymorphic";

export type TextProps<C extends ElementType = "span"> =
PolymorphicComponentPropsWithRef<C, IStyledTextProps & StyledEmEmProps>;
Expand Down
4 changes: 2 additions & 2 deletions src/mocks/handlers/payment.ts
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down
7 changes: 4 additions & 3 deletions src/mocks/handlers/room.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 3 additions & 1 deletion src/pages/roomDetailPage/RoomDetailMap.tsx
Original file line number Diff line number Diff line change
@@ -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;
}
}
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/searchPage/components/searchItem/SearchItem.tsx
Original file line number Diff line number Diff line change
@@ -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 }) => {
Expand Down
2 changes: 1 addition & 1 deletion src/types/searchList.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export interface ISearchList {
id: string;
id: number;
name: string;
roomType: string;
imageUrl: string;
Expand Down
3 changes: 2 additions & 1 deletion tests/e2eTests/global.setup.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2eTests/specs/authentication/register.spec.ts
Original file line number Diff line number Diff line change
@@ -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: [] } });

Expand Down
9 changes: 5 additions & 4 deletions tests/unitTestsSrc/VerificationPage.spec.tsx
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
7 changes: 4 additions & 3 deletions tests/unitTestsSrc/useEmailVerification.spec.tsx
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down

0 comments on commit 1de6b63

Please sign in to comment.