From 6c73cfddc9f94a3799f6944a1d1cb8556e30d90f Mon Sep 17 00:00:00 2001 From: "C. Fuhrman" Date: Fri, 10 Jan 2025 15:46:17 -0500 Subject: [PATCH] use src/constants (abs path) so it can remap when jest runs --- client/src/__tests__/services/WebsocketService.test.tsx | 8 +------- client/src/pages/Student/JoinRoom/JoinRoom.tsx | 2 +- client/src/pages/Teacher/ManageRoom/ManageRoom.tsx | 2 +- client/src/services/ApiService.tsx | 6 +++--- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/client/src/__tests__/services/WebsocketService.test.tsx b/client/src/__tests__/services/WebsocketService.test.tsx index b4965dc..5a98e3e 100644 --- a/client/src/__tests__/services/WebsocketService.test.tsx +++ b/client/src/__tests__/services/WebsocketService.test.tsx @@ -1,16 +1,10 @@ //WebsocketService.test.tsx import WebsocketService from '../../services/WebsocketService'; import { io, Socket } from 'socket.io-client'; -import { ENV_VARIABLES } from '../../constants'; +import { ENV_VARIABLES } from 'src/constants'; jest.mock('socket.io-client'); -// jest.mock('../../constants', () => ({ -// ENV_VARIABLES: { -// VITE_BACKEND_SOCKET_URL: 'https://ets-glitch-backend.glitch.me/' -// } -// })); - describe('WebSocketService', () => { let mockSocket: Partial; diff --git a/client/src/pages/Student/JoinRoom/JoinRoom.tsx b/client/src/pages/Student/JoinRoom/JoinRoom.tsx index 1c865e8..040f22e 100644 --- a/client/src/pages/Student/JoinRoom/JoinRoom.tsx +++ b/client/src/pages/Student/JoinRoom/JoinRoom.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { Socket } from 'socket.io-client'; -import { ENV_VARIABLES } from '../../../constants'; +import { ENV_VARIABLES } from 'src/constants'; import StudentModeQuiz from '../../../components/StudentModeQuiz/StudentModeQuiz'; import TeacherModeQuiz from '../../../components/TeacherModeQuiz/TeacherModeQuiz'; diff --git a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx index c65b179..949a6de 100644 --- a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx +++ b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx @@ -10,7 +10,7 @@ import webSocketService, { AnswerReceptionFromBackendType } from '../../../servi import { QuizType } from '../../../Types/QuizType'; import './manageRoom.css'; -import { ENV_VARIABLES } from '../../../constants'; +import { ENV_VARIABLES } from 'src/constants'; import { StudentType, Answer } from '../../../Types/StudentType'; import { Button } from '@mui/material'; import LoadingCircle from '../../../components/LoadingCircle/LoadingCircle'; diff --git a/client/src/services/ApiService.tsx b/client/src/services/ApiService.tsx index ea0d79d..987c091 100644 --- a/client/src/services/ApiService.tsx +++ b/client/src/services/ApiService.tsx @@ -1,8 +1,8 @@ import axios, { AxiosError, AxiosResponse } from 'axios'; -import { ENV_VARIABLES } from '../constants'; -import { QuizType } from '../Types/QuizType'; -import { FolderType } from '../Types/FolderType'; +import { FolderType } from 'src/Types/FolderType'; +import { QuizType } from 'src/Types/QuizType'; +import { ENV_VARIABLES } from 'src/constants'; class ApiService { private BASE_URL: string;