fix: post en put request met body ipv param
This commit is contained in:
Gabriellvl
parent
793b2b6bb1
commit
dba8902eeb
6 changed files with 239 additions and 119 deletions
|
|
@ -40,10 +40,18 @@ describe('Student controllers', () => {
|
|||
};
|
||||
});
|
||||
|
||||
it('Get student', async () => {
|
||||
req = { params: { username: 'DireStraits' }};
|
||||
|
||||
await getStudentHandler(req as Request, res as Response);
|
||||
|
||||
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ student: expect.anything() }));
|
||||
});
|
||||
|
||||
it('Student not found', async () => {
|
||||
req = { params: { username: 'doesnotexist' } };
|
||||
|
||||
await expect(() => deleteStudentHandler(req as Request, res as Response))
|
||||
await expect(() => getStudentHandler(req as Request, res as Response))
|
||||
.rejects
|
||||
.toThrow(NotFoundException);
|
||||
});
|
||||
|
|
@ -56,10 +64,10 @@ describe('Student controllers', () => {
|
|||
.toThrowError(BadRequestException);
|
||||
});
|
||||
|
||||
it('Create student', async () => {
|
||||
it('Create and delete student', async () => {
|
||||
req = {
|
||||
body: {
|
||||
username: 'NewstudentId21',
|
||||
username: 'coolstudent',
|
||||
firstName: 'New',
|
||||
lastName: 'Student'
|
||||
}
|
||||
|
|
@ -68,7 +76,12 @@ describe('Student controllers', () => {
|
|||
await createStudentHandler(req as Request, res as Response);
|
||||
|
||||
expect(statusMock).toHaveBeenCalledWith(201);
|
||||
expect(jsonMock).toHaveBeenCalled();
|
||||
|
||||
req = { params: { username: 'coolstudent' } };
|
||||
|
||||
await deleteStudentHandler(req as Request, res as Response);
|
||||
|
||||
expect(statusMock).toHaveBeenCalledWith(200);
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -108,7 +121,7 @@ describe('Student controllers', () => {
|
|||
expect(studentUsernames).toContain('DireStraits');
|
||||
|
||||
// check length, +1 because of create
|
||||
expect(result.students).toHaveLength(TEST_STUDENTS.length + 1);
|
||||
expect(result.students).toHaveLength(TEST_STUDENTS.length);
|
||||
});
|
||||
|
||||
it('Student classes', async () => {
|
||||
|
|
@ -135,7 +148,7 @@ describe('Student controllers', () => {
|
|||
});
|
||||
|
||||
it('Student submissions', async () => {
|
||||
req = { params: { username: 'DireStraits' } };
|
||||
req = { params: { username: 'DireStraits' }, query: { full: 'true' } };
|
||||
|
||||
await getStudentSubmissionsHandler(req as Request, res as Response);
|
||||
|
||||
|
|
@ -156,15 +169,6 @@ describe('Student controllers', () => {
|
|||
expect(result.questions).to.have.length.greaterThan(0);
|
||||
});
|
||||
|
||||
it('Delete student', async () => {
|
||||
req = { params: { username: 'coolstudent' } };
|
||||
|
||||
await deleteStudentHandler(req as Request, res as Response);
|
||||
|
||||
expect(statusMock).toHaveBeenCalledWith(200);
|
||||
expect(jsonMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('Deleting non-existent student', async () => {
|
||||
req = { params: { username: 'doesnotexist' } };
|
||||
|
||||
|
|
@ -194,7 +198,8 @@ describe('Student controllers', () => {
|
|||
|
||||
it('Create join request', async () => {
|
||||
req = {
|
||||
params: { username: 'Noordkaap', classId: 'id02' },
|
||||
params: { username: 'Noordkaap' },
|
||||
body: { classId: 'id02' }
|
||||
};
|
||||
|
||||
await createStudentRequestHandler(req as Request, res as Response);
|
||||
|
|
@ -204,7 +209,8 @@ describe('Student controllers', () => {
|
|||
|
||||
it('Create join request duplicate', async () => {
|
||||
req = {
|
||||
params: { username: 'Tool', classId: 'id02' },
|
||||
params: { username: 'Tool' },
|
||||
body: { classId: 'id02' }
|
||||
};
|
||||
|
||||
await expect(() => createStudentRequestHandler(req as Request, res as Response))
|
||||
210
backend/tests/controllers/teachers.test.ts
Normal file
210
backend/tests/controllers/teachers.test.ts
Normal file
|
|
@ -0,0 +1,210 @@
|
|||
import {beforeAll, beforeEach, describe, expect, it, Mock, vi} from "vitest";
|
||||
import {Request, Response} from "express";
|
||||
import {setupTestApp} from "../setup-tests";
|
||||
import {NotFoundException} from "../../src/exceptions/not-found-exception";
|
||||
import {
|
||||
createTeacherHandler,
|
||||
deleteTeacherHandler,
|
||||
getAllTeachersHandler, getStudentJoinRequestHandler, getTeacherClassHandler,
|
||||
getTeacherHandler, getTeacherQuestionHandler, getTeacherStudentHandler, updateStudentJoinRequestHandler
|
||||
} from "../../src/controllers/teachers";
|
||||
import {BadRequestException} from "../../src/exceptions/bad-request-exception";
|
||||
import {EntityAlreadyExistsException} from "../../src/exceptions/entity-already-exists-exception";
|
||||
import {getStudentRequestHandler} from "../../src/controllers/students";
|
||||
|
||||
describe('Teacher controllers', () => {
|
||||
let req: Partial<Request>;
|
||||
let res: Partial<Response>;
|
||||
|
||||
let jsonMock: Mock;
|
||||
let statusMock: Mock;
|
||||
|
||||
beforeAll(async () => {
|
||||
await setupTestApp();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
jsonMock = vi.fn();
|
||||
statusMock = vi.fn().mockReturnThis();
|
||||
res = {
|
||||
json: jsonMock,
|
||||
status: statusMock,
|
||||
};
|
||||
});
|
||||
|
||||
it('Get teacher', async () => {
|
||||
req = { params: { username: 'FooFighters' }};
|
||||
|
||||
await getTeacherHandler(req as Request, res as Response);
|
||||
|
||||
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ teacher: expect.anything() }));
|
||||
});
|
||||
|
||||
it('Teacher not found', async () => {
|
||||
req = {params: {username: 'doesnotexist'}};
|
||||
|
||||
await expect(() => getTeacherHandler(req as Request, res as Response))
|
||||
.rejects
|
||||
.toThrow(NotFoundException);
|
||||
});
|
||||
|
||||
it('No username', async () => {
|
||||
req = { params: {} };
|
||||
|
||||
await expect(() => getTeacherHandler(req as Request, res as Response))
|
||||
.rejects
|
||||
.toThrowError(BadRequestException);
|
||||
});
|
||||
|
||||
it('Create and delete teacher', async () => {
|
||||
req = {
|
||||
body: {
|
||||
username: 'coolteacher',
|
||||
firstName: 'New',
|
||||
lastName: 'Teacher'
|
||||
}
|
||||
};
|
||||
|
||||
await createTeacherHandler(req as Request, res as Response);
|
||||
|
||||
expect(statusMock).toHaveBeenCalledWith(201);
|
||||
|
||||
req = { params: { username: 'coolteacher' } };
|
||||
|
||||
await deleteTeacherHandler(req as Request, res as Response);
|
||||
|
||||
expect(statusMock).toHaveBeenCalledWith(200);
|
||||
});
|
||||
|
||||
it('Create duplicate student', async () => {
|
||||
req = {
|
||||
body: {
|
||||
username: 'FooFighters',
|
||||
firstName: 'Dave',
|
||||
lastName: 'Grohl',
|
||||
}
|
||||
};
|
||||
|
||||
await expect(() => createTeacherHandler(req as Request, res as Response))
|
||||
.rejects
|
||||
.toThrowError(EntityAlreadyExistsException);
|
||||
});
|
||||
|
||||
it('Create teacher no body', async () => {
|
||||
req = { body: {} };
|
||||
|
||||
await expect(() => createTeacherHandler(req as Request, res as Response))
|
||||
.rejects
|
||||
.toThrowError(BadRequestException);
|
||||
});
|
||||
|
||||
it('Teacher list', async () => {
|
||||
req = { query: { full: 'true' } };
|
||||
|
||||
await getAllTeachersHandler(req as Request, res as Response);
|
||||
|
||||
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ teachers: expect.anything() }));
|
||||
|
||||
const result = jsonMock.mock.lastCall?.[0];
|
||||
|
||||
const teacherUsernames = result.teachers.map((s: any) => s.username);
|
||||
expect(teacherUsernames).toContain('FooFighters');
|
||||
|
||||
expect(result.teachers).toHaveLength(4);
|
||||
});
|
||||
|
||||
it('Deleting non-existent student', async () => {
|
||||
req = { params: { username: 'doesnotexist' } };
|
||||
|
||||
await expect(() => deleteTeacherHandler(req as Request, res as Response))
|
||||
.rejects
|
||||
.toThrow(NotFoundException);
|
||||
});
|
||||
|
||||
|
||||
it('Get teacher classes', async () => {
|
||||
req = {
|
||||
params: { username: 'FooFighters' },
|
||||
query: { full: 'true' },
|
||||
};
|
||||
|
||||
await getTeacherClassHandler(req as Request, res as Response);
|
||||
|
||||
expect(jsonMock).toHaveBeenCalledWith(expect.anything());
|
||||
|
||||
const result = jsonMock.mock.lastCall?.[0];
|
||||
// console.log('[TEACHER CLASSES]', result);
|
||||
expect(result.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
it('Get teacher students', async () => {
|
||||
req = {
|
||||
params: { username: 'FooFighters' },
|
||||
query: { full: 'true' },
|
||||
};
|
||||
|
||||
await getTeacherStudentHandler(req as Request, res as Response);
|
||||
|
||||
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ students: expect.anything() }));
|
||||
|
||||
const result = jsonMock.mock.lastCall?.[0];
|
||||
// console.log('[TEACHER STUDENTS]', result.students);
|
||||
expect(result.students.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
it('Get teacher questions', async () => {
|
||||
req = {
|
||||
params: { username: 'FooFighters' },
|
||||
query: { full: 'true' },
|
||||
};
|
||||
|
||||
await getTeacherQuestionHandler(req as Request, res as Response);
|
||||
|
||||
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ questions: expect.anything() }));
|
||||
|
||||
const result = jsonMock.mock.lastCall?.[0];
|
||||
// console.log('[TEACHER QUESTIONS]', result.questions);
|
||||
expect(result.questions.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
it('Get join requests by class', async () => {
|
||||
req = {
|
||||
query: { username: 'LimpBizkit' },
|
||||
params: { classId: 'id02' },
|
||||
};
|
||||
|
||||
await getStudentJoinRequestHandler(req as Request, res as Response);
|
||||
|
||||
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ joinRequests: expect.anything() }));
|
||||
|
||||
const result = jsonMock.mock.lastCall?.[0];
|
||||
// console.log('[JOIN REQUESTS FOR CLASS]', result.joinRequests);
|
||||
expect(result.joinRequests.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
it('Update join request status', async () => {
|
||||
req = {
|
||||
query: { username: 'LimpBizkit', studentUsername: 'PinkFloyd' },
|
||||
params: { classId: 'id02' },
|
||||
body: { accepted: 'true' }
|
||||
};
|
||||
|
||||
await updateStudentJoinRequestHandler(req as Request, res as Response);
|
||||
|
||||
expect(statusMock).toHaveBeenCalledWith(200);
|
||||
|
||||
req = {
|
||||
params: { username: 'PinkFloyd' },
|
||||
};
|
||||
|
||||
await getStudentRequestHandler(req as Request, res as Response);
|
||||
|
||||
const result = jsonMock.mock.lastCall?.[0];
|
||||
const status = result.requests[0].status
|
||||
expect(status).toBeTruthy;
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
Reference in a new issue