Merge pull request #50 from oslabs-beta/denton/testing3

Denton/testing3

Author: AhnafKhvn

__tests__/server.test.tsx

@@ -2,12 +2,12 @@
  * @jest-environment node
  */
 
-
 import marketplaceController from '../server/controllers/marketplaceController'; 
+import sessionController from '../server/controllers/sessionController';
 import app from '../server/server';
 import mockData from '../mockData';
 import { profileEnd } from 'console';
-import { Projects } from '../server/models/reactypeModels';
+import { Projects, Users, Sessions } from '../server/models/reactypeModels';
 const request = require('supertest');
 const mongoose = require('mongoose');
 const mockNext = jest.fn(); // Mock nextFunction
@@ -25,7 +25,8 @@ beforeAll(async () => {
 afterAll(async () => {
 
   const result = await Projects.deleteMany({});//clear the projects collection after tests are done
-  console.log(`${result.deletedCount} documents deleted.`);
+  const result2 = await Users.deleteMany({_id: {$ne: '64f551e5b28d5292975e08c8'}});//clear the users collection after tests are done except for the mockdata user account
+  const result3 = await Sessions.deleteMany({cookieId: {$ne: '64f551e5b28d5292975e08c8'}});
   await mongoose.connection.close();
 });
 
@@ -287,13 +288,121 @@ describe('Server endpoint tests', () => {
       });
     });
   });
+});
+
+describe('SessionController tests', () => {
+
+
+
+  describe('isLoggedIn',() => {
+
+    afterEach(() => {
+      jest.resetAllMocks();
+    })
+  // Mock Express request and response objects and next function
+    const mockReq: any = {
+      cookies: null,//trying to trigger if cookies was not assigned
+      body: {
+        userId: 'sampleUserId', // Set up a sample userId in the request body
+      },
+    }
+    const mockRes: any = {
+      json: jest.fn(),
+      status: jest.fn(),
+      redirect: jest.fn()
+    };
+    const next = jest.fn();
+    it('Assign userId from request body to cookieId', async () => {
+    // Call isLoggedIn
+      await sessionController.isLoggedIn(mockReq, mockRes, next);
+      expect(mockRes.redirect).toHaveBeenCalledWith('/');
+    // Ensure that next() was called
+    });
+    it('Trigger a database query error for findOne', async () => {
+      const mockFindOne = jest.spyOn(mongoose.model('Sessions'), 'findOne').mockImplementation(() => {
+        throw new Error('Database query error');
+      });
+    // Call isLoggedIn
+      await sessionController.isLoggedIn(mockReq, mockRes, next);
+    // Ensure that next() was called with the error
+      expect(next).toHaveBeenCalledWith(expect.objectContaining({
+        log: expect.stringMatching('Database query error'), // The 'i' flag makes it case-insensitive
+      }));
+
+      mockFindOne.mockRestore();
+    });
+  });
+  
+  
+  describe('startSession',() => {
+      
+    afterEach(() => {
+      jest.resetAllMocks();
+    })
+    it('Trigger a database query error for findOne', async () => {
+
+      const mockReq: any = {
+        cookies: projectToSave.userId,//trying to trigger if cookies was not assigned
+        body: {
+          userId: 'sampleUserId', // Set up a sample userId in the request body
+        },
+      }
+      const mockRes: any = {
+        json: jest.fn(),
+        status: jest.fn(),
+        redirect: jest.fn(),
+        locals: {id: projectToSave.userId}
+      };
+    
+      const next = jest.fn();
+      const findOneMock = jest.spyOn(mongoose.model('Sessions'), 'findOne') as jest.Mock;
+      findOneMock.mockImplementation((query: any, callback: (err: any, ses: any) => void) => {
+        callback(new Error('Database query error'), null);
+      });
+      // Call startSession
+      await sessionController.startSession(mockReq, mockRes, next);
+      // Check that next() was called with the error
+      expect(next).toHaveBeenCalledWith(expect.objectContaining({
+        log: expect.stringMatching('Database query error'), // The 'i' flag makes it case-insensitive
+      }));
+
+      findOneMock.mockRestore();
+    });
 
+    xit('Check if a new Session is created', async () => {//not working for some reason cannot get mocknext() to be called in test?
+
+      const mockReq: any = {
+        cookies: projectToSave.userId,//trying to trigger if cookies was not assigned
+        body: {
+          userId: 'sampleUserId', // Set up a sample userId in the request body
+        },
+      }
+      const mockRes: any = {
+        json: jest.fn(),
+        status: jest.fn(),
+        redirect: jest.fn(),
+        locals: {id: 'testID'}//a sesion id that doesnt exist
+      };
+    
+      const mockNext = jest.fn();
+    
+      //Call startSession
+      // Wrap your test logic in an async function
+      await sessionController.startSession(mockReq, mockRes, mockNext);
 
+      //check if it reaches next()
+      //await expect(mockRes.locals.ssid).toBe('testID');
+      expect(mockNext).toHaveBeenCalled();
 
 
+     
+    });
+  });
 });
 
 
+  
+
 
 
 

__tests__/userAuth.test.ts

@@ -93,6 +93,8 @@ describe('User Authentication tests', () => {
 
 });
 
+
+
 // import request from 'supertest';
 // import app from '../server/server';
 // import mockObj from '../mockData';

app/src/components/marketplace/MarketplaceCard.tsx

@@ -131,8 +131,8 @@ const MarketplaceCard = ({ proj }: { proj: Project }) => {
         />
         <CardHeader
           avatar={
-            <Avatar sx={{ bgcolor: red[500] }} aria-label="recipe">
-              R
+            <Avatar sx={{ bgcolor: '#0bcaa8' }} aria-label="recipe">
+              {proj.username.slice(0,1).toUpperCase()}
             </Avatar>
           }
           action={

coverage-ts/files/app/src/Dashboard/NavbarDash.tsx.html

@@ -11,7 +11,7 @@
 <link href="../../../../assets/source-file.css" type="text/css" rel="stylesheet">
     </head>
     <body>
-    <div style="margin-top:3em" class="ui container"><h1 class="ui header"><a href="../../../../index.html">TypeScript coverage report</a></h1><table style="margin-top:2em" class="ui celled table"><thead class=""><tr class=""><th class="">Filename</th><th class="">Percent</th><th class="">Threshold</th><th class="">Total</th><th class="">Covered</th><th class="">Uncovered</th></tr></thead><tbody class=""><tr class="positive"><td class="">app/src/Dashboard/NavbarDash.tsx</td><td class="">88.44%</td><td class="">80%</td><td class="">225</td><td class="">199</td><td class="">26</td></tr></tbody></table><textarea id="editor" readonly="" style="margin-top:3em">import React, { useState, useContext } from &#x27;react&#x27;;
+    <div style="margin-top:3em" class="ui container"><h1 class="ui header"><a href="../../../../index.html">TypeScript coverage report</a></h1><table style="margin-top:2em" class="ui celled table"><thead class=""><tr class=""><th class="">Filename</th><th class="">Percent</th><th class="">Threshold</th><th class="">Total</th><th class="">Covered</th><th class="">Uncovered</th></tr></thead><tbody class=""><tr class="positive"><td class="">app/src/Dashboard/NavbarDash.tsx</td><td class="">88.51%</td><td class="">80%</td><td class="">235</td><td class="">208</td><td class="">27</td></tr></tbody></table><textarea id="editor" readonly="" style="margin-top:3em">import React, { useState, useContext } from &#x27;react&#x27;;
 import { Theme } from &#x27;@mui/material/styles&#x27;;
 import withStyles from &#x27;@mui/styles/withStyles&#x27;;
 import createStyles from &#x27;@mui/styles/createStyles&#x27;;
@@ -106,11 +106,13 @@
     &lt;div className={classes.root} style={style}&gt;
       &lt;AppBar position=&#x27;static&#x27;&gt;
         &lt;Toolbar&gt;
-          &lt;Avatar src={greenLogo}&gt;&lt;/Avatar&gt;
-          &lt;Typography variant=&quot;h6&quot; style={{ marginLeft: &#x27;1rem&#x27; }} className={classes.title}&gt;
-            ReacType
-          &lt;/Typography&gt;
-           &lt;div style ={ { textDecoration: &#x27;none&#x27; } }&gt;
+          &lt;Link to=&quot;/&quot; style={{display: &#x27;inline-flex&#x27;, justifyContent: &#x27;center&#x27;, textDecoration: &#x27;none&#x27;}}&gt;  
+            &lt;Avatar src={greenLogo}&gt;&lt;/Avatar&gt;
+            &lt;Typography variant=&quot;h6&quot; style={{ marginTop: &#x27;0.3rem&#x27;, marginLeft: &#x27;0.5rem&#x27;, color: &#x27;silver&#x27; }} className={classes.title}&gt;
+              ReacType
+            &lt;/Typography&gt;
+          &lt;/Link&gt; 
+           &lt;div style ={ { marginLeft: &#x27;0.5rem&#x27;, textDecoration: &#x27;none&#x27; } }&gt;
             &lt;Button
             variant=&#x27;contained&#x27;
             color=&#x27;primary&#x27;
@@ -185,8 +187,8 @@
     &lt;/div&gt;
   );
 }
-</textarea><pre id="annotations" style="display:none">[{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:65,&quot;character&quot;:34,&quot;text&quot;:&quot;theme&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:8,&quot;text&quot;:&quot;color&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:15,&quot;text&quot;:&quot;theme&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:21,&quot;text&quot;:&quot;palette&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:29,&quot;text&quot;:&quot;common&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:36,&quot;text&quot;:&quot;white&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:75,&quot;character&quot;:31,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:84,&quot;character&quot;:9,&quot;text&quot;:&quot;anchorEl&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:85,&quot;character&quot;:22,&quot;text&quot;:&quot;event&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:86,&quot;character&quot;:16,&quot;text&quot;:&quot;event&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:86,&quot;character&quot;:22,&quot;text&quot;:&quot;currentTarget&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:112,&quot;character&quot;:12,&quot;text&quot;:&quot;anchorEl&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:112,&quot;character&quot;:22,&quot;text&quot;:&quot;anchorEl&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:114,&quot;character&quot;:26,&quot;text&quot;:&quot;anchorEl&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:119,&quot;character&quot;:22,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:119,&quot;character&quot;:28,&quot;text&quot;:&quot;optionClicked&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:145,&quot;character&quot;:21,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:145,&quot;character&quot;:27,&quot;text&quot;:&quot;isThemeLight&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:150,&quot;character&quot;:14,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:150,&quot;character&quot;:20,&quot;text&quot;:&quot;isThemeLight&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:150,&quot;character&quot;:35,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:150,&quot;character&quot;:41,&quot;text&quot;:&quot;setTheme&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:150,&quot;character&quot;:59,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:150,&quot;character&quot;:65,&quot;text&quot;:&quot;setTheme&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:153,&quot;character&quot;:13,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:153,&quot;character&quot;:19,&quot;text&quot;:&quot;isThemeLight&quot;,&quot;kind&quot;:1}]</pre></div>
-    <p class="footer-text">TypeScript Coverage Report generated by <a href="https://github.com/plantain-00/type-coverage">type-coverage</a> and <a href="https://github.com/alexcanessa/typescript-coverage-report">typescript-coverage-report</a> at Fri, 05 May 2023 01:51:04 GMT</p>
+</textarea><pre id="annotations" style="display:none">[{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:20,&quot;character&quot;:7,&quot;text&quot;:&quot;greenLogo&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:65,&quot;character&quot;:34,&quot;text&quot;:&quot;theme&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:8,&quot;text&quot;:&quot;color&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:15,&quot;text&quot;:&quot;theme&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:21,&quot;text&quot;:&quot;palette&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:29,&quot;text&quot;:&quot;common&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:69,&quot;character&quot;:36,&quot;text&quot;:&quot;white&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:75,&quot;character&quot;:31,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:84,&quot;character&quot;:9,&quot;text&quot;:&quot;anchorEl&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:85,&quot;character&quot;:22,&quot;text&quot;:&quot;event&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:86,&quot;character&quot;:16,&quot;text&quot;:&quot;event&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:86,&quot;character&quot;:22,&quot;text&quot;:&quot;currentTarget&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:114,&quot;character&quot;:12,&quot;text&quot;:&quot;anchorEl&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:114,&quot;character&quot;:22,&quot;text&quot;:&quot;anchorEl&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:116,&quot;character&quot;:26,&quot;text&quot;:&quot;anchorEl&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:121,&quot;character&quot;:22,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:121,&quot;character&quot;:28,&quot;text&quot;:&quot;optionClicked&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:147,&quot;character&quot;:21,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:147,&quot;character&quot;:27,&quot;text&quot;:&quot;isThemeLight&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:152,&quot;character&quot;:14,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:152,&quot;character&quot;:20,&quot;text&quot;:&quot;isThemeLight&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:152,&quot;character&quot;:35,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:152,&quot;character&quot;:41,&quot;text&quot;:&quot;setTheme&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:152,&quot;character&quot;:59,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:152,&quot;character&quot;:65,&quot;text&quot;:&quot;setTheme&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:155,&quot;character&quot;:13,&quot;text&quot;:&quot;props&quot;,&quot;kind&quot;:1},{&quot;file&quot;:&quot;app/src/Dashboard/NavbarDash.tsx&quot;,&quot;line&quot;:155,&quot;character&quot;:19,&quot;text&quot;:&quot;isThemeLight&quot;,&quot;kind&quot;:1}]</pre></div>
+    <p class="footer-text">TypeScript Coverage Report generated by <a href="https://github.com/plantain-00/type-coverage">type-coverage</a> and <a href="https://github.com/alexcanessa/typescript-coverage-report">typescript-coverage-report</a> at Thu, 07 Sep 2023 18:28:49 GMT</p>
     </body>
   </html>