update tests

Author: raclim

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

@@ -5,7 +5,7 @@ import { Request, Response } from 'jest-express';
 
 import Project from '../../../models/project';
 import User from '../../../models/user';
-import deleteProject from '../../project.controller/deleteProject';
+import deleteProject from '../deleteProject';
 import { deleteObjectsFromS3 } from '../../aws.controller';
 
 jest.mock('../../../models/project');
@@ -21,11 +21,13 @@ describe('project.controller', () => {
     request = new Request();
     response = new Response();
     Project.findById = jest.fn();
+    jest.spyOn(console, 'error').mockImplementation(() => {});
   });
 
   afterEach(() => {
     request.resetMocked();
     response.resetMocked();
+    console.error.mockRestore();
   });
 
   it('returns 403 if project is not owned by authenticated user', async () => {
@@ -64,18 +66,22 @@ describe('project.controller', () => {
     const user = new User();
     const project = new Project();
     project.user = user;
-    project.remove = jest.fn().mockResolvedValue();
+    project.files = [];
+    project.deleteOne = jest.fn().mockResolvedValue();
 
     request.setParams({ project_id: project._id });
     request.user = { _id: user._id };
 
     Project.findById.mockResolvedValue(project);
     deleteObjectsFromS3.mockResolvedValue();
 
+    response.end = jest.fn();
+
     await deleteProject(request, response);
 
     expect(deleteObjectsFromS3).toHaveBeenCalled();
-    expect(project.remove).toHaveBeenCalled();
+    expect(project.deleteOne).toHaveBeenCalled();
     expect(response.status).toHaveBeenCalledWith(200);
+    expect(response.end).toHaveBeenCalled();
   });
 });

server/controllers/user.controller/__tests__/apiKey.test.js

@@ -3,156 +3,136 @@
 import { last } from 'lodash';
 import { Request, Response } from 'jest-express';
 
-import User, { createMock, createInstanceMock } from '../../../models/user';
-import { createApiKey, removeApiKey } from '../../user.controller/apiKey';
+import User from '../../../models/user';
+import { createApiKey, removeApiKey } from '../apiKey';
 
 jest.mock('../../../models/user');
 
 describe('user.controller', () => {
-  let UserMock;
-  let UserInstanceMock;
+  let request;
+  let response;
 
   beforeEach(() => {
-    UserMock = createMock();
-    UserInstanceMock = createInstanceMock();
+    request = new Request();
+    response = new Response();
   });
 
   afterEach(() => {
-    UserMock.restore();
-    UserInstanceMock.restore();
+    request.resetMocked();
+    response.resetMocked();
+    jest.clearAllMocks();
   });
 
   describe('createApiKey', () => {
-    it("returns an error if user doesn't exist", () => {
-      const request = { user: { id: '1234' } };
-      const response = new Response();
+    it("returns an error if user doesn't exist", async () => {
+      request.user = { id: '1234' };
+      response = new Response();
 
-      UserMock.expects('findById').withArgs('1234').yields(null, null);
+      User.findById = jest.fn().mockResolvedValue(null);
 
-      createApiKey(request, response);
+      await createApiKey(request, response);
 
       expect(response.status).toHaveBeenCalledWith(404);
       expect(response.json).toHaveBeenCalledWith({
         error: 'User not found'
       });
     });
 
-    it('returns an error if label not provided', () => {
-      const request = { user: { id: '1234' }, body: {} };
-      const response = new Response();
+    it('returns an error if label not provided', async () => {
+      request.user = { id: '1234' };
+      request.body = {};
 
-      UserMock.expects('findById').withArgs('1234').yields(null, new User());
+      const user = new User();
+      User.findById = jest.fn().mockResolvedValue(user);
 
-      createApiKey(request, response);
+      await createApiKey(request, response);
 
       expect(response.status).toHaveBeenCalledWith(400);
       expect(response.json).toHaveBeenCalledWith({
         error: "Expected field 'label' was not present in request body"
       });
     });
 
-    it('returns generated API key to the user', (done) => {
-      const request = new Request();
+    it('returns generated API key to the user', async () => {
       request.setBody({ label: 'my key' });
       request.user = { id: '1234' };
 
-      const response = new Response();
-
       const user = new User();
+      user.apiKeys = [];
 
-      UserMock.expects('findById').withArgs('1234').yields(null, user);
-
-      UserInstanceMock.expects('save').yields();
-
-      function expectations() {
-        const lastKey = last(user.apiKeys);
+      User.findById = jest.fn().mockResolvedValue(user);
+      user.save = jest.fn().mockResolvedValue();
 
-        expect(lastKey.label).toBe('my key');
-        expect(typeof lastKey.hashedKey).toBe('string');
+      await createApiKey(request, response);
 
-        const responseData = response.json.mock.calls[0][0];
+      const lastKey = last(user.apiKeys);
 
-        expect(responseData.apiKeys.length).toBe(1);
-        expect(responseData.apiKeys[0]).toMatchObject({
-          label: 'my key',
-          token: lastKey.hashedKey,
-          lastUsedAt: undefined,
-          createdAt: undefined
-        });
+      expect(lastKey.label).toBe('my key');
+      expect(typeof lastKey.hashedKey).toBe('string');
 
-        done();
-      }
-
-      const promise = createApiKey(request, response);
-
-      promise.then(expectations, expectations).catch(expectations);
+      const responseData = response.json.mock.calls[0][0];
+      expect(responseData.apiKeys.length).toBe(1);
+      expect(responseData.apiKeys[0]).toMatchObject({
+        label: 'my key',
+        token: lastKey.hashedKey
+      });
     });
   });
 
   describe('removeApiKey', () => {
-    it("returns an error if user doesn't exist", () => {
-      const request = { user: { id: '1234' } };
-      const response = new Response();
+    it("returns an error if user doesn't exist", async () => {
+      request.user = { id: '1234' };
+      response = new Response();
 
-      UserMock.expects('findById').withArgs('1234').yields(null, null);
+      User.findById = jest.fn().mockResolvedValue(null);
 
-      removeApiKey(request, response);
+      await removeApiKey(request, response);
 
       expect(response.status).toHaveBeenCalledWith(404);
       expect(response.json).toHaveBeenCalledWith({
         error: 'User not found'
       });
     });
 
-    it("returns an error if specified key doesn't exist", () => {
-      const request = {
-        user: { id: '1234' },
-        params: { keyId: 'not-a-real-key' }
-      };
-      const response = new Response();
+    it("returns an error if specified key doesn't exist", async () => {
+      request.user = { id: '1234' };
+      request.params = { keyId: 'not-a-real-key' };
       const user = new User();
+      user.apiKeys = [];
 
-      UserMock.expects('findById').withArgs('1234').yields(null, user);
+      User.findById = jest.fn().mockResolvedValue(user);
 
-      removeApiKey(request, response);
+      await removeApiKey(request, response);
 
       expect(response.status).toHaveBeenCalledWith(404);
       expect(response.json).toHaveBeenCalledWith({
         error: 'Key does not exist for user'
       });
     });
 
-    it('removes key if it exists', () => {
-      const user = new User();
-      user.apiKeys.push({ label: 'first key' }); // id 0
-      user.apiKeys.push({ label: 'second key' }); // id 1
+    it('removes key if it exists', async () => {
+      const mockKey1 = { _id: 'id1', id: 'id1', label: 'first key' };
+      const mockKey2 = { _id: 'id2', id: 'id2', label: 'second key' };
 
-      const firstKeyId = user.apiKeys[0]._id.toString();
-      const secondKeyId = user.apiKeys[1]._id.toString();
+      const apiKeys = [mockKey1, mockKey2];
+      apiKeys.find = Array.prototype.find;
+      apiKeys.pull = jest.fn();
 
-      const request = {
-        user: { id: '1234' },
-        params: { keyId: firstKeyId }
+      const user = {
+        apiKeys,
+        save: jest.fn().mockResolvedValue()
       };
-      const response = new Response();
 
-      UserMock.expects('findById').withArgs('1234').yields(null, user);
+      request.user = { id: '1234' };
+      request.params = { keyId: 'id1' };
 
-      UserInstanceMock.expects('save').yields();
+      User.findById = jest.fn().mockResolvedValue(user);
 
-      removeApiKey(request, response);
+      await removeApiKey(request, response);
 
+      expect(user.apiKeys.pull).toHaveBeenCalledWith({ _id: 'id1' });
+      expect(user.save).toHaveBeenCalled();
       expect(response.status).toHaveBeenCalledWith(200);
-
-      const responseData = response.json.mock.calls[0][0];
-
-      expect(responseData.apiKeys.length).toBe(1);
-      expect(responseData.apiKeys[0]).toMatchObject({
-        id: secondKeyId,
-        label: 'second key',
-        lastUsedAt: undefined,
-        createdAt: undefined
-      });
     });
   });
 });