Merge pull request #365 from tcet-opensource/hotfixtestcases

fixed all testcases to fit new format for testcases

Author: TejasNair9977

_apidoc.js

@@ -667,7 +667,7 @@
  */
 
 //-----------------------------------------------------------------------------
-//Organization
+// Organization
 //-----------------------------------------------------------------------------
 
 /**

jest.config.js

@@ -1,7 +1,11 @@
 const config = {
   transform: {
   },
-  "testTimeout": 15000,
+  testTimeout: 15000,
+  setupFiles: [
+    "./test/config/setup.js",
+    "./test/config/teardown.js",
+  ],
 };
 
 export default config;

models/activity.js

@@ -22,9 +22,9 @@ const activitySchema = {
 
 const Activity = connector.model("Activity", activitySchema);
 
-///crud operation///
+/// crud operation///
 
-//add a activity to the database
+// add a activity to the database
 async function create(activityData){
   const {
     activityBlueprint, startTime,duration,course,faculty,type,task,group,students,
@@ -36,25 +36,25 @@ async function create(activityData){
   return activityDoc;
 }
 
-//Retrieve activity based on a given  filter and limit
+// Retrieve activity based on a given  filter and limit
 async function read(filter,limit=1){
   const activityDoc = await Activity.find (filter).limit(limit);
   return activityDoc ; 
 }
 
-//update activity based on a given filter 
+// update activity based on a given filter 
 async function update(filter,updateObject,options={multi:true}){
   const updateActivity= await Activity.updateMany(filter,{$set:updateObject},options);
 return updateActivity.acknowledged;
 }
 
-//Delete activity based on a given filter
+// Delete activity based on a given filter
 async function remove(filter){
   const deleteActivity= await Activity.deleteMany(filter).exec();
-  return deleteActivity.acknowledged
+  return deleteActivity.acknowledged;
 }
 
-//export crud functions
+// export crud functions
 
 export default{
   create,read,update,remove,

services/activity.js

@@ -25,7 +25,7 @@ export async function activityList(filter){
 }
 
 export async function deleteActivityById(id){
-    const deleted = await Activity.remove({_id:id},data);
+    const deleted = await Activity.remove({_id:id});
     if(deleted){
         return deleted;
     }

services/module.js

@@ -24,13 +24,13 @@ export async function updateModuleById(id,data) {
   if (updated) {
     return updated;
   }
-  throw new databaseError.DataEntryError("Module")
+  throw new databaseError.DataEntryError("Module");
 }
 
 export async function deleteModuleById(ModuleId) {
   const deleted = await Module.remove({ _id: ModuleId });
   if (deleted) {
     return deleted;
   }
-  throw new databaseError.DataDeleteError("Module")
+  throw new databaseError.DataDeleteError("Module");
 }

test/config/setup.js

@@ -0,0 +1,14 @@
+import request from "supertest";
+import app from "#app"; // Update this import based on your app"s structure
+import connector from "#models/databaseUtil"; // Update this import
+
+const server = app.listen(null, () => {
+    connector.set("debug", false);
+});
+const agent = request.agent(server);
+global.server = server;
+global.agent = agent;
+export default async () => {
+    global.server = server;
+    global.agent = agent;
+};

test/config/teardown.js

@@ -0,0 +1,4 @@
+global.server.close();
+global.agent.app.close();
+export default async () => {
+};

test/routes/accreditation.test.js

@@ -1,30 +1,17 @@
-import request from "supertest";
 import { jest } from "@jest/globals"; // eslint-disable-line import/no-extraneous-dependencies
-import app from "#app";
 import accreditationModel from "#models/accreditation";
 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) {
   accreditationModel.remove({ name: "xyz" }).then(() => {
     connector.disconnect((DBerr) => {
       if (DBerr) console.log("Database dissconnnect error: ", DBerr);
-      server.close((serverErr) => {
-        if (serverErr) console.log(serverErr);
-        callback();
-      });
     });
+    callback();
   });
 }
 

test/routes/activity.test.js

@@ -1,21 +1,9 @@
-import { jest } from "@jest/globals"; //eslint-disable-line-import/no-extraneous-dependencies
-import request from "supertest";
-import app from "#app";//Update this import based on your app's 
-import connector from "#models/databaseUtil"; //Update this import
-import activityModel from "#models/activity"; //Update this import
+import { jest } from "@jest/globals";  // eslint-disable-line import/no-extraneous-dependencies
+import connector from "#models/databaseUtil"; // Update this import
+import activityModel from "#models/activity"; // Update this import
 
 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) {
   activityModel
@@ -32,10 +20,7 @@ function cleanUp(callback) {
     .then(() => {
       connector.disconnect((DBerr) => {
         if (DBerr) console.log("Database disconnect error : ", DBerr);
-        server.close((serverErr) => {
-          if (serverErr) console.log(serverErr);
-          callback();
-        });
+        callback();
       });
     });
 }

test/routes/assignment.test.js

@@ -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 assignmentModel from "#models/assignment";
 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) {
     assignmentModel.remove({ no: "123" }).then(() => {
     connector.disconnect((DBerr) => {
       if (DBerr) console.log("Database dissconnnect error: ", DBerr);
-      server.close((serverErr) => {
-        if (serverErr) console.log(serverErr);
-        callback();
-      });
+      callback();
     });
   });
 }