update tests for getProjectsForUser to async/await

Author: raclim

server/controllers/project.controller/__test__/getProjectsForUser.test.js

@@ -3,7 +3,7 @@
  */
 import { Request, Response } from 'jest-express';
 
-import { createMock } from '../../../models/user';
+import User from '../../../models/user';
 import getProjectsForUser, {
   apiGetProjectsForUser
 } from '../../project.controller/getProjectsForUser';
@@ -12,14 +12,8 @@ jest.mock('../../../models/user');
 jest.mock('../../aws.controller');
 
 describe('project.controller', () => {
-  let UserMock;
-
   beforeEach(() => {
-    UserMock = createMock();
-  });
-
-  afterEach(() => {
-    UserMock.restore();
+    User.findByUsername = jest.fn();
   });
 
   describe('getProjectsForUser()', () => {
@@ -42,117 +36,79 @@ describe('project.controller', () => {
       promise.then(expectations, expectations).catch(expectations);
     });
 
-    it('returns 404 if user does not exist', (done) => {
+    it('returns 404 if user does not exist', async () => {
       const request = new Request();
       request.setParams({ username: 'abc123' });
       const response = new Response();
 
-      UserMock.expects('findOne')
-        .withArgs({ username: 'abc123' })
-        .resolves(null);
-
-      const promise = getProjectsForUser(request, response);
-
-      function expectations() {
-        expect(response.status).toHaveBeenCalledWith(404);
-        expect(response.json).toHaveBeenCalledWith({
-          message: 'User with that username does not exist.'
-        });
+      await User.findByUsername.mockResolvedValue(null);
 
-        done();
-      }
+      await getProjectsForUser(request, response);
 
-      promise.then(expectations, expectations).catch(expectations);
+      expect(response.status).toHaveBeenCalledWith(404);
+      expect(response.json).toHaveBeenCalledWith({
+        message: 'User with that username does not exist.'
+      });
     });
 
-    it('returns 500 on other errors', (done) => {
+    it('returns 500 on other errors', async () => {
       const request = new Request();
       request.setParams({ username: 'abc123' });
       const response = new Response();
 
-      UserMock.expects('findOne')
-        .withArgs({ username: 'abc123' })
-        .rejects(new Error());
+      await User.findByUsername.mockRejectedValue(new Error());
 
-      const promise = getProjectsForUser(request, response);
-
-      function expectations() {
-        expect(response.json).toHaveBeenCalledWith({
-          message: 'Error fetching projects'
-        });
-        expect(response.status).toHaveBeenCalledWith(500);
-
-        done();
-      }
+      await getProjectsForUser(request, response);
 
-      promise.then(expectations, expectations).catch(expectations);
+      expect(response.json).toHaveBeenCalledWith({
+        message: 'Error fetching projects'
+      });
+      expect(response.status).toHaveBeenCalledWith(500);
     });
   });
 
   describe('apiGetProjectsForUser()', () => {
-    it('returns validation error if username not provided', (done) => {
+    it('returns validation error if username not provided', async () => {
       const request = new Request();
       request.setParams({});
       const response = new Response();
 
-      const promise = apiGetProjectsForUser(request, response);
-
-      function expectations() {
-        expect(response.status).toHaveBeenCalledWith(422);
-        expect(response.json).toHaveBeenCalledWith({
-          message: 'Username not provided'
-        });
-
-        done();
-      }
+      await apiGetProjectsForUser(request, response);
 
-      promise.then(expectations, expectations).catch(expectations);
+      expect(response.status).toHaveBeenCalledWith(422);
+      expect(response.json).toHaveBeenCalledWith({
+        message: 'Username not provided'
+      });
     });
 
-    it('returns 404 if user does not exist', (done) => {
+    it('returns 404 if user does not exist', async () => {
       const request = new Request();
       request.setParams({ username: 'abc123' });
       const response = new Response();
 
-      UserMock.expects('findOne')
-        .withArgs({ username: 'abc123' })
-        .resolves(null);
-
-      const promise = apiGetProjectsForUser(request, response);
-
-      function expectations() {
-        expect(response.status).toHaveBeenCalledWith(404);
-        expect(response.json).toHaveBeenCalledWith({
-          message: 'User with that username does not exist.'
-        });
+      await User.findByUsername.mockResolvedValue(null);
 
-        done();
-      }
+      await apiGetProjectsForUser(request, response);
 
-      promise.then(expectations, expectations).catch(expectations);
+      expect(response.status).toHaveBeenCalledWith(404);
+      expect(response.json).toHaveBeenCalledWith({
+        message: 'User with that username does not exist.'
+      });
     });
 
-    it('returns 500 on other errors', (done) => {
+    it('returns 500 on other errors', async () => {
       const request = new Request();
       request.setParams({ username: 'abc123' });
       const response = new Response();
 
-      UserMock.expects('findOne')
-        .withArgs({ username: 'abc123' })
-        .rejects(new Error());
-
-      const promise = apiGetProjectsForUser(request, response);
-
-      function expectations() {
-        expect(response.status).toHaveBeenCalledWith(500);
-        expect(response.json).toHaveBeenCalledWith({
-          message: 'Error fetching projects'
-        });
+      await User.findByUsername.mockRejectedValue(new Error());
 
-        done();
-      }
+      await apiGetProjectsForUser(request, response);
 
-      promise.then(expectations, expectations).catch(expectations);
+      expect(response.status).toHaveBeenCalledWith(500);
+      expect(response.json).toHaveBeenCalledWith({
+        message: 'Error fetching projects'
+      });
     });
   });
 });