Skip to content

Commit

Permalink
fixed testcases for attendance
Browse files Browse the repository at this point in the history
  • Loading branch information
TejasNair9977 committed Oct 14, 2023
1 parent 91dea20 commit ba54cf8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 31 deletions.
4 changes: 2 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import moduleRouter from "#routes/module";
import facultyRouter from "#routes/faculty";
import { identifyUser } from "#middleware/identifyUser";
import departmentRouter from "#routes/department";
import attendenceRouter from "#routes/attendance";
import attendanceRouter from "#routes/attendance";
import examRouter from "#routes/exam";
import paperRouter from "#routes/paper";
import groupRouter from "#routes/group";
Expand Down Expand Up @@ -61,7 +61,7 @@ app.use("/timetable", timetableRouter);
app.use("/department", departmentRouter);
app.use("/coursework", courseworkRouter);
app.use("/module", moduleRouter);
app.use("/attendence", attendenceRouter);
app.use("/attendance", attendanceRouter);
app.use("/exam", examRouter);
app.use("/paper", paperRouter);
app.use("/group", groupRouter);
Expand Down
2 changes: 1 addition & 1 deletion services/attendance.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export async function addNewAttendance( student, course, monthlyAttended, monthl
cumulativeAttended,
cumulativeOccured,
});
if (newAttendance.student === student) {
if (String(newAttendance.student) === student) {
return newAttendance;
}
throw new databaseError.DataEntryError("Add Attendance");
Expand Down
42 changes: 14 additions & 28 deletions test/routes/attendance.test.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
import request from "supertest";
import { jest } from "@jest/globals"; // eslint-disable-line import/no-extraneous-dependencies
import app from "#app";
import attendanceModel from "#models/attendance";
import connector from "#models/databaseUtil";

jest.mock("#util");

let server;
let agent;
beforeAll((done) => {
server = app.listen(null, () => {
agent = request.agent(server);
connector.set("debug", false);
done();
});
});
const { agent } = global;

function cleanUp(callback) {
attendanceModel.remove({ student: "xyz" }).then(() => {
attendanceModel.remove({ student: "64fc3c8bde9fa947ea1f412f" }).then(() => {
connector.disconnect((DBerr) => {
if (DBerr) console.log("Database dissconnnect error: ", DBerr);
server.close((serverErr) => {
if (serverErr) console.log(serverErr);
callback();
});
callback();
});
});
}
Expand All @@ -35,8 +21,8 @@ afterAll((done) => {
describe("checking attendance functions", () => {
it("create attendance", async () => {
const response = await agent.post("/attendance/add").send({
student: "xyz",
course: "XYZ",
student: "64fc3c8bde9fa947ea1f412f",
course: "64fc3c8bde9fa947ea1f412f",
monthlyAttended: 123,
monthlyOccured: 123,
cumulativeAttended: 123,
Expand All @@ -49,32 +35,32 @@ describe("checking attendance functions", () => {
let id;
beforeEach(async () => {
id = await agent.post("/attendance/add").send({
student: "xyz",
course: "XYZ",
monthlyAttended: 123,
monthlyOccured: 123,
cumulativeAttended: 123,
cumulativeOccured: 123,
student: "64fc3c8bde9fa947ea1f412f",
course: "64fc3c8bde9fa947ea1f412f",
monthlyAttended: 123,
monthlyOccured: 123,
cumulativeAttended: 123,
cumulativeOccured: 123,
});
id = JSON.parse(id.res.text).id;
});

afterEach(async () => {
await attendanceModel.remove({ student: "xyz" });
await attendanceModel.remove({ student: "64fc3c8bde9fa947ea1f412f" });
});

it("read attendance", async () => {
const response = await agent
.get("/attendance/list")
.send({ student: "xyz" });
.send({ student: "64fc3c8bde9fa947ea1f412f" });
expect(response.status).toBe(200);
expect(response.body.res).toBeDefined();
});

it("update attendance", async () => {
const response = await agent
.post(`/attendance/update/${id}`)
.send({ student: "xyz" }, { student: "123" });
.send({ student: "64fc3c8bde9fa947ea1f412f" });
expect(response.headers["content-type"]).toMatch(/json/);
expect(response.status).toBe(200);
expect(response.body.res).toMatch(/attendance updated/);
Expand Down

0 comments on commit ba54cf8

Please sign in to comment.