Skip to content

Commit 7d2f7fe

Browse files
committed
Fix test
1 parent f871392 commit 7d2f7fe

File tree

5 files changed

+64
-15
lines changed

5 files changed

+64
-15
lines changed

frontend/src/components/Navbar/Navbar.test.tsx

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,31 @@ import { MemoryRouter } from "react-router-dom";
88

99
jest.mock("axios");
1010

11+
jest.mock("../../utils/api", () => ({
12+
getUserUrl: jest.fn().mockReturnValue("http://localhost:3001/api"),
13+
getQuestionsUrl: jest
14+
.fn()
15+
.mockReturnValue("http://localhost:3000/api/questions"),
16+
getCodeExecutionUrl: jest
17+
.fn()
18+
.mockReturnValue("http://localhost:3004/api/run"),
19+
getQnHistoriesUrl: jest
20+
.fn()
21+
.mockReturnValue("http://localhost:3006/api/qnhistories"),
22+
}));
23+
24+
jest.mock("../../utils/matchSocket", () => ({
25+
getMatchSocketUrl: jest.fn().mockReturnValue("http://localhost:3002"),
26+
}));
27+
28+
jest.mock("../../utils/collabSocket", () => ({
29+
getCollabSocketUrl: jest.fn().mockReturnValue("http://localhost:3003"),
30+
}));
31+
32+
jest.mock("../../utils/communicationSocket", () => ({
33+
getCommunicationSocketUrl: jest.fn().mockReturnValue("http://localhost:3005"),
34+
}));
35+
1136
const mockedAxios = axios as jest.Mocked<typeof axios>;
1237

1338
const mockUseNavigate = jest.fn();

frontend/src/utils/api.ts

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
11
import axios from "axios";
22

3-
const usersUrl =
4-
import.meta.env.VITE_USER_SERVICE_URL ?? "http://localhost:3001/api";
5-
const questionsUrl =
6-
import.meta.env.VITE_QN_SERVICE_URL ?? "http://localhost:3000/api/questions";
7-
const codeExecutionUrl =
8-
import.meta.env.VITE_CODE_EXEC_SERVICE_URL ?? "http://localhost:3004/api/run";
9-
const qnHistoriesUrl =
10-
import.meta.env.VITE_QN_HIST_SERVICE_URL ??
11-
"http://localhost:3006/api/qnhistories";
3+
const getUserUrl = () => {
4+
return import.meta.env.SOME_ENV_VAR_HERE ?? "http://localhost:3001/api";
5+
};
6+
7+
const getQuestionsUrl = () => {
8+
return (
9+
import.meta.env.SOME_ENV_VAR_HERE ?? "http://localhost:3000/api/questions"
10+
);
11+
};
12+
13+
const getCodeExecutionUrl = () => {
14+
return import.meta.env.SOME_ENV_VAR_HERE ?? "http://localhost:3004/api/run";
15+
};
16+
17+
const getQnHistoriesUrl = () => {
18+
return (
19+
import.meta.env.SOME_ENV_VAR_HERE ?? "http://localhost:3006/api/qnhistories"
20+
);
21+
};
22+
23+
const usersUrl = getUserUrl();
24+
const questionsUrl = getQuestionsUrl();
25+
const codeExecutionUrl = getCodeExecutionUrl();
26+
const qnHistoriesUrl = getQnHistoriesUrl();
1227

1328
export const questionClient = axios.create({
1429
baseURL: questionsUrl,

frontend/src/utils/collabSocket.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,11 @@ export type CollabSessionData = {
3838
awareness: Awareness;
3939
};
4040

41-
const COLLAB_SOCKET_URL =
42-
import.meta.env.VITE_COLLAB_SERVICE_URL ?? "http://localhost:3003";
41+
const getCollabSocketUrl = () => {
42+
return import.meta.env.VITE_COLLAB_SERVICE_URL ?? "http://localhost:3003";
43+
};
44+
45+
const COLLAB_SOCKET_URL = getCollabSocketUrl();
4346

4447
export const collabSocket = io(COLLAB_SOCKET_URL, {
4548
reconnectionAttempts: 5,

frontend/src/utils/communicationSocket.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ export enum CommunicationEvents {
1616
DISCONNECTED = "disconnected",
1717
}
1818

19-
const COMMUNICATION_SOCKET_URL =
20-
import.meta.env.VITE_COMM_SERVICE_URL ?? "http://localhost:3005";
19+
const getCommunicationSocketUrl = () => {
20+
return import.meta.env.VITE_COMM_SERVICE_URL ?? "http://localhost:3005";
21+
};
22+
23+
const COMMUNICATION_SOCKET_URL = getCommunicationSocketUrl();
2124

2225
export const communicationSocket = io(COMMUNICATION_SOCKET_URL, {
2326
reconnectionAttempts: 3,

frontend/src/utils/matchSocket.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import { io } from "socket.io-client";
22
import { getToken } from "./token";
33

4-
const MATCH_SOCKET_URL =
5-
import.meta.env.VITE_MATCH_SERVICE_URL ?? "http://localhost:3002";
4+
const getMatchSocketUrl = () => {
5+
return import.meta.env.VITE_MATCH_SERVICE_URL ?? "http://localhost:3002";
6+
};
7+
8+
const MATCH_SOCKET_URL = getMatchSocketUrl();
69

710
export const matchSocket = io(MATCH_SOCKET_URL, {
811
reconnectionAttempts: 3,

0 commit comments

Comments
 (0)