Reformatted the code for testing files!

Author: BishoySedra

tests/group-chats.test.js

@@ -27,8 +27,6 @@ const wickhamToken = await wickham.getToken();
 const lydiaToken = await lydia.getToken();
 const bingleyToken = await bingley.getToken();
 
-//console.log("LIZ TOKEN ", elizabethToken);
-
 await elizabeth.sendFriendRequest(darcy.email);
 await darcy.respondToFriendRequest(elizabeth.email, "ACCEPTED");
 await elizabeth.getPrivateChats(elizabeth.email);
@@ -40,19 +38,8 @@ await lydia.respondToFriendRequest(wickham.email, "ACCEPTED");
 const createGroupURL = `${process.env.BASE_URL}/chats/groups/create`;
 const addFriendToGroupURL = `${process.env.BASE_URL}/chats/groups/add-friend`;
 
-//let groupID;
-
-//
-
 describe("Group chats tests", () => {
   describe("Group Creation", () => {
-    // Cases =>
-    // 1. Elizabeth creates a group chat -> 200
-    // 2. Elizabeth tries to create a group with missing fields -> 400
-    //   - groupName missing
-    //   - groupDescription missing
-    //   - adminEmail missing
-
     it("Create a group chat -> 200", async () => {
       const res = await request(app)
         .post(createGroupURL)
@@ -62,7 +49,6 @@ describe("Group chats tests", () => {
           groupName: "Pride and Prejudice",
           groupDescription: "A group chat for discussing the novel",
         });
-      //groupID = res.body.body;
       expect(res.status).toBe(200);
     });
 
@@ -96,20 +82,10 @@ describe("Group chats tests", () => {
   });
 
   describe("Add someone to group", () => {
-    // Cases =>
-    // 1. Elizabeth adds Darcy to the group -> 200
-    // 2. Elizabeth tries to add Darcy to the group with missing fields -> 400
-    //  - groupID missing
-    //  - friendEmail missing
-    //  - adminEmail missing
-    // 3. Elizabeth tries to add Darcy to the group with wrong groupID non-existent group -> 400
-    // 4. Elizabeth tries to add Darcy to the group with wrong friendEmail -> 404
-    // 5. Wickham tries to add Darcy to the group -> 403
-
     it("Add friend to group -> 200", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const res = await request(app)
@@ -120,14 +96,13 @@ describe("Group chats tests", () => {
           userEmail: darcy.email,
           chatID: groupID,
         });
-      //console.log("GROUP ID ", groupID);
       expect(res.status).toBe(200);
     });
 
     it("Add friend to group with missing fields -> 400", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const possibleResponses = [
@@ -165,7 +140,7 @@ describe("Group chats tests", () => {
     it("Add friend to group with wrong groupID non-existent group -> 404", async () => {
       await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
       const groupID = "313233343536373839303132";
       const res = await request(app)
@@ -182,7 +157,7 @@ describe("Group chats tests", () => {
     it("Add friend to group with wrong friendEmail -> 404", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const res = await request(app)
@@ -199,7 +174,7 @@ describe("Group chats tests", () => {
     it("User not in group trying to add another user, both are not friends -> 403", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const res = await request(app)
@@ -219,7 +194,7 @@ describe("Group chats tests", () => {
 
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const res = await request(app)
@@ -236,7 +211,7 @@ describe("Group chats tests", () => {
     it("User in group trying to add another user, both are not friends -> 403", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       await elizabeth.addFriendToGroup(groupID, wickham.email);
@@ -249,31 +224,20 @@ describe("Group chats tests", () => {
           userEmail: lydia.email,
           chatID: groupID,
         });
-      //console.log("USER ADD FRIEND TO GROUP ", res.body);
       expect(res.status).toBe(403);
     });
   });
 
   describe("Get group details", () => {
-    // Cases =>
-    // 1. Elizabeth, the admin, gets group details -> 200
-    // 2. Elizabeth tries to get group details with missing group ID -> 400
-    // 3. Elizabeth tries to get group details with wrong group ID format -> 400
-    // 4. Elizabeth tries to get group details for a non-existent group -> 404
-    // 5. Wickham, who isn't in the group, tries to get group details -> 403
-    // 6. Darcy, who is in the group, tries to get group details -> 200
-    //
-
     it("Get group details -> 200", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const res = await request(app)
         .get(`${process.env.BASE_URL}/chats/groups/details/${groupID}`)
         .set("Authorization", elizabethToken);
-      //console.log("GROUP DETAILS ", res.body);
       expect(res.status).toBe(200);
     });
 
@@ -294,7 +258,7 @@ describe("Group chats tests", () => {
     it("Get group details for a non-existent group -> 404", async () => {
       const res = await request(app)
         .get(
-          `${process.env.BASE_URL}/chats/groups/details/313233343536373839303132`,
+          `${process.env.BASE_URL}/chats/groups/details/313233343536373839303132`
         )
         .set("Authorization", elizabethToken);
       expect(res.status).toBe(404);
@@ -303,7 +267,7 @@ describe("Group chats tests", () => {
     it("User not in group trying to get group details -> 403", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const res = await request(app)
@@ -315,10 +279,10 @@ describe("Group chats tests", () => {
     it("User in group trying to get group details -> 200", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
-      const addDarcy = await elizabeth.addFriendToGroup(groupID, darcy.email);
+      await elizabeth.addFriendToGroup(groupID, darcy.email);
 
       const res = await request(app)
         .get(`${process.env.BASE_URL}/chats/groups/details/${groupID}`)
@@ -328,19 +292,10 @@ describe("Group chats tests", () => {
   });
 
   describe("Delete group", () => {
-    // Cases =>
-    // 1. Elizabeth, the admin, deletes the group -> 200
-    // 2. Elizabeth tries to delete the group with missing group ID -> 400
-    // 3. Elizabeth tries to delete the group with wrong group ID format -> 400
-    // 4. Elizabeth tries to delete a non-existent group -> 404
-    // 5. Elizabeth tries to delete the group, without passing admin email -> 400
-    // 5. Lydia, who isn't in the group, tries to delete the group -> 403
-    // 6. Darcy, who is in the group, tries to delete the group -> 403
-
     it("Delete group -> 200", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const res = await request(app)
@@ -360,7 +315,6 @@ describe("Group chats tests", () => {
         .send({
           email: elizabeth.email,
         });
-      //console.log("DELETE GROUP ", res.body);
       expect(res.status).toBe(400);
     });
 
@@ -387,7 +341,7 @@ describe("Group chats tests", () => {
     it("Delete group without passing admin email -> 400", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const res = await request(app)
@@ -402,7 +356,7 @@ describe("Group chats tests", () => {
     it("User not in group trying to delete group -> 403", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       const res = await request(app)
@@ -417,7 +371,7 @@ describe("Group chats tests", () => {
     it("User in group trying to delete group -> 403", async () => {
       const groupID = await elizabeth.createGroup(
         "Pride and Prejudice",
-        "A group chat for discussing the novel",
+        "A group chat for discussing the novel"
       );
 
       await elizabeth.addFriendToGroup(groupID, darcy.email);

tests/registeration.test.js

@@ -1,17 +1,16 @@
 import request from "supertest";
-import app  from "../index.js";
+import app from "../index.js";
 import mongoose from "mongoose";
 import connetDB, { clearAllCollections } from "../src/db/connection.js";
+import env from "dotenv";
 
-import env from "dotenv"
-env.config()
+env.config();
+await clearAllCollections(mongoose.connection);
 
- await clearAllCollections(mongoose.connection);
- 
 describe("POST /users/register", () => {
-  describe("given a username, email and password", () => {
-    const url = `${process.env.BASE_URL}/auth/register`;
-    // all is well
+  const url = `${process.env.BASE_URL}/auth/register`;
+
+  describe("Given a username, email, and password", () => {
     it("should respond with status code 201", async () => {
       const response = await request(app).post(url).send({
         username: "test",
@@ -23,7 +22,7 @@ describe("POST /users/register", () => {
 
     describe("Missing data", () => {
       it("should respond with status code 400", async () => {
-        const possibleResponses = [
+        const testCases = [
           { username: "test", email: "test@mail.com", password: null },
           { username: "test", email: null, password: "Password123" },
           { username: "test", email: null, password: null },
@@ -33,23 +32,20 @@ describe("POST /users/register", () => {
           { username: null, email: null, password: null },
         ];
 
-        for (const testCase of possibleResponses) {
-          const response = await request(app)
-            .post(url)
-            .send(testCase);
+        for (const testCase of testCases) {
+          const response = await request(app).post(url).send(testCase);
           expect(response.statusCode).toBe(400);
         }
       });
     });
+
     describe("Data format is wrong", () => {
-      // password is too short
       it("Password too short -> 400", async () => {
         const response = await request(app).post(url).send({
           username: "test",
           email: "test@mail.com",
           password: "Test1",
         });
-        //expect(password.length).toBeLessThan(8);
         expect(response.statusCode).toBe(400);
       });
 
@@ -59,53 +55,46 @@ describe("POST /users/register", () => {
           email: "test@mail.com",
           password: "Password123",
         });
-        //expect(username.length).toBeLessThan(3);
         expect(response.statusCode).toBe(400);
       });
 
-      // password is not valid
       it("Password is non-compliant -> 400", async () => {
         const response = await request(app).post(url).send({
           username: "test",
           email: "test@mail.com",
           password: "Password123",
         });
-        // expect(password).not.toMatch(
-        //   /^ (?=.* [A - Z])(?=.* [a - z])(?=.*\d).+ $/,
-        // );
         expect(response.statusCode).toBe(400);
       });
     });
 
-    // email is not valid
     it("Email is non-compliant -> 400", async () => {
       const response = await request(app).post(url).send({
         username: "test",
         email: "testmail.com",
         password: "Password123",
       });
-      //expect(email).not.toMatch(/^\S+@\S+\.\S+$/);
       expect(response.statusCode).toBe(400);
     });
 
     describe("Duplicate field", () => {
-      
-      it("email is already taken -> 409", async () => {
+      it("Email is already taken -> 409", async () => {
         const existingEmail = "chat@sphere.com";
         const response1 = await request(app).post(url).send({
+          username: "test",
+          email: existingEmail,
+          password: "Password123",
+        });
+
+        if (response1.statusCode === 201) {
+          const response2 = await request(app).post(url).send({
             username: "test",
             email: existingEmail,
             password: "Password123",
           });
-        if(response1.statusCode === 201){
-            const response2 = await request(app).post(url).send({
-                username: "test",
-                email: existingEmail,
-                password: "Password123",
-              });
-              expect(response2.statusCode).toBe(409);
+          expect(response2.statusCode).toBe(409);
         }
-        expect(response1.statusCode).not.toBe(201)
+        expect(response1.statusCode).not.toBe(201);
       });
     });
   });