Skip to content

Commit d37b252

Browse files
authored
Merge pull request #131 from guanquann/readme
Fix frontend test
2 parents bb20400 + eac5b8f commit d37b252

File tree

6 files changed

+75
-16
lines changed

6 files changed

+75
-16
lines changed

backend/code-execution-service/tests/codeExecutionRoutes.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import supertest from "supertest";
2-
import app from "../app";
2+
import app from "../src/app";
33
import {
44
ERROR_MISSING_REQUIRED_FIELDS_MESSAGE,
55
ERROR_UNSUPPORTED_LANGUAGE_MESSAGE,

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,37 @@ 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+
36+
jest.mock("y-protocols/awareness.js", () => {
37+
return {
38+
Awareness: jest.fn(),
39+
};
40+
});
41+
1142
const mockedAxios = axios as jest.Mocked<typeof axios>;
1243

1344
const mockUseNavigate = jest.fn();

frontend/src/utils/api.ts

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
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.VITE_USER_SERVICE_URL ?? "http://localhost:3001/api";
5+
};
6+
7+
const getQuestionsUrl = () => {
8+
return (
9+
import.meta.env.VITE_QN_SERVICE_URL ?? "http://localhost:3000/api/questions"
10+
);
11+
};
12+
13+
const getCodeExecutionUrl = () => {
14+
return (
15+
import.meta.env.VITE_CODE_EXEC_SERVICE_URL ??
16+
"http://localhost:3004/api/run"
17+
);
18+
};
19+
20+
const getQnHistoriesUrl = () => {
21+
return (
22+
import.meta.env.VITE_QN_HIST_SERVICE_URL ??
23+
"http://localhost:3006/api/qnhistories"
24+
);
25+
};
26+
27+
const usersUrl = getUserUrl();
28+
const questionsUrl = getQuestionsUrl();
29+
const codeExecutionUrl = getCodeExecutionUrl();
30+
const qnHistoriesUrl = getQnHistoriesUrl();
1231

1332
export const questionClient = axios.create({
1433
baseURL: questionsUrl,

frontend/src/utils/collabSocket.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ export enum CollabEvents {
2727
SOCKET_RECONNECT_FAILED = "reconnect_failed",
2828
}
2929

30-
const COLLAB_SOCKET_URL =
31-
import.meta.env.VITE_COLLAB_SERVICE_URL ?? "http://localhost:3003";
30+
const getCollabSocketUrl = () => {
31+
return import.meta.env.VITE_COLLAB_SERVICE_URL ?? "http://localhost:3003";
32+
};
33+
34+
const COLLAB_SOCKET_URL = getCollabSocketUrl();
3235

3336
export const createCollabSocket = () =>
3437
io(COLLAB_SOCKET_URL, {

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 createCommunicationSocket = () =>
2326
io(COMMUNICATION_SOCKET_URL, {

frontend/src/utils/matchSocket.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ export enum MatchEvents {
2727
SOCKET_RECONNECT_FAILED = "reconnect_failed",
2828
}
2929

30-
const MATCH_SOCKET_URL =
31-
import.meta.env.VITE_MATCH_SERVICE_URL ?? "http://localhost:3002";
30+
const getMatchSocketUrl = () => {
31+
return import.meta.env.VITE_MATCH_SERVICE_URL ?? "http://localhost:3002";
32+
};
33+
34+
const MATCH_SOCKET_URL = getMatchSocketUrl();
3235

3336
export const createMatchSocket = () =>
3437
io(MATCH_SOCKET_URL, {

0 commit comments

Comments
 (0)