fix tests

Author: hirsch88

package.json

@@ -124,7 +124,8 @@
       "js",
       "json"
     ],
-    "testEnvironment": "node"
+    "testEnvironment": "node",
+    "setupTestFrameworkScriptFile": "./test/unit/lib/setup.ts"
   },
   "license": "MIT"
 }

test/setup/.gitkeep

@@ -1,18 +1,13 @@
-import { authenticate as Authenticate } from '../../../../src/api/middlewares/authenticate';
+import { AuthenticateMiddleware } from '../../../../src/api/middlewares/AuthenticateMiddleware';
+import { LogMock } from '../../lib/LogMock';
 
+describe('AuthenticateMiddleware', () => {
 
-describe('authenticate', () => {
-
-    let authenticate, request, log, res, req, next;
+    let authenticate, request, res, req, next;
     beforeEach(() => {
         process.env.AUTH0_HOST = 'test';
-        log = {
-            debug: jest.fn(),
-            info: jest.fn(),
-            warn: jest.fn()
-        };
         request = jest.fn();
-        authenticate = Authenticate(request, log);
+        authenticate = new AuthenticateMiddleware(LogMock, request);
         res = {
             failed: jest.fn()
         };
@@ -24,11 +19,11 @@ describe('authenticate', () => {
 
     test('Should fail because no token was given', () => {
         req.headers.authorization = undefined;
-        authenticate(req, res, next);
+        authenticate.use(req, res, next);
         expect(res.failed).toHaveBeenCalledWith(403, 'You are not allowed to request this resource!');
 
         req.headers.authorization = '';
-        authenticate(req, res, next);
+        authenticate.use(req, res, next);
         expect(res.failed).toHaveBeenCalledWith(403, 'You are not allowed to request this resource!');
 
     });
@@ -39,31 +34,27 @@ describe('authenticate', () => {
             expect(options.url).toBe('test/tokeninfo');
             expect(options.form.id_token).toBe('1234');
         };
-        const auth = Authenticate(request, log);
-        auth(req, res, next);
-        expect(log.debug).toHaveBeenCalledWith('Token is provided');
-
+        const auth = new AuthenticateMiddleware(LogMock, request);
+        auth.use(req, res, next);
     });
 
     test('Should pass and add the token info to the request object', () => {
         request = (options, done) => {
             done(null, { statusCode: 200 }, '{ "user_id": 77, "email": "test@jest.org" }');
             expect(req.tokeninfo.user_id).toBe(77);
-            expect(log.info).toHaveBeenCalled();
             expect(next).toHaveBeenCalled();
         };
-        const auth = Authenticate(request, log);
-        auth(req, res, next);
+        const auth = new AuthenticateMiddleware(LogMock, request);
+        auth.use(req, res, next);
     });
 
     test('Should fail and respond with a 401 error', () => {
         request = (options, done) => {
             done(null, { statusCode: 401 }, 'Bad message :-)');
-            expect(log.warn).toHaveBeenCalled();
             expect(res.failed).toHaveBeenCalledWith(401, 'Bad message :-)');
         };
-        const auth = Authenticate(request, log);
-        auth(req, res, next);
+        const auth = new AuthenticateMiddleware(LogMock, request);
+        auth.use(req, res, next);
     });
 
 });

…nit/api/middlewares/authenticate.test.ts …ddlewares/AuthenticateMiddleware.test.tstest/unit/api/middlewares/authenticate.test.ts renamed to test/unit/api/middlewares/AuthenticateMiddleware.test.ts test/unit/api/middlewares/authenticate.test.ts renamed to test/unit/api/middlewares/AuthenticateMiddleware.test.ts

@@ -1,16 +1,13 @@
-import { populateUser as PopulateUser } from '../../../../src/api/middlewares/populateUser';
+import { PopulateUserMiddleware } from '../../../../src/api/middlewares/PopulateUserMiddleware';
+import { LogMock } from '../../lib/LogMock';
 
 
-describe('populateUser', () => {
+describe('PopulateUserMiddleware', () => {
 
-    let populateUser, userService, log, res, req, next;
+    let populateUser, userService, res, req, next;
     beforeEach(() => {
         process.env.AUTH0_HOST = 'test';
-        log = {
-            debug: jest.fn(),
-            warn: jest.fn()
-        };
-        populateUser = PopulateUser(() => userService, log);
+        populateUser = new PopulateUserMiddleware(LogMock, userService);
         res = {
             failed: jest.fn()
         };
@@ -22,10 +19,10 @@ describe('populateUser', () => {
 
     test('Should fail because no tokeninfo or user_id is given', () => {
         req.tokeninfo.user_id = undefined;
-        populateUser(req, res, next);
+        populateUser.use(req, res, next);
         expect(res.failed).toBeCalledWith(400, 'Missing token information!');
         req.tokeninfo = undefined;
-        populateUser(req, res, next);
+        populateUser.use(req, res, next);
         expect(res.failed).toBeCalledWith(400, 'Missing token information!');
     });
 
@@ -39,13 +36,12 @@ describe('populateUser', () => {
                         })
                     });
                     expect(req.user.id).toBe(88);
-                    expect(log.debug).toHaveBeenCalledWith(`populated user with the id=88 to the request object`);
                     expect(next).toBeCalled();
                 });
             })
         };
-        const pop = PopulateUser(() => userService, log);
-        pop(req, res, next);
+        const pop = new PopulateUserMiddleware(LogMock, userService);
+        pop.use(req, res, next);
     });
 
     test('Should behave...', () => {
@@ -54,13 +50,12 @@ describe('populateUser', () => {
                 return new Promise((resolve, reject) => {
                     reject(new Error('test'));
                     expect(req.user).toBeUndefined();
-                    expect(log.warn).toHaveBeenCalledWith(`could not populate user to the request object`);
                     expect(next).toBeCalled();
                 });
             })
         };
-        const pop = PopulateUser(() => userService, log);
-        pop(req, res, next);
+        const pop = new PopulateUserMiddleware(LogMock, userService);
+        pop.use(req, res, next);
     });
 
 });

…nit/api/middlewares/populateUser.test.ts …ddlewares/PopulateUserMiddleware.test.tstest/unit/api/middlewares/populateUser.test.ts renamed to test/unit/api/middlewares/PopulateUserMiddleware.test.ts test/unit/api/middlewares/populateUser.test.ts renamed to test/unit/api/middlewares/PopulateUserMiddleware.test.ts

@@ -2,14 +2,6 @@ import { Bootstrap } from '../../../src/core/Bootstrap';
 
 
 describe('Bootstrap', () => {
-    test('getApp should return a new app with port and host', () => {
-        process.env.APP_HOST = 'host';
-        process.env.PORT = '3000';
-        const app = Bootstrap.getApp();
-        expect(app.get('host')).toBe(process.env.APP_HOST);
-        expect(app.get('port')).toBe(Bootstrap.normalizePort(process.env.PORT));
-    });
-
     test('normalizePort should return a valid port', () => {
         expect(Bootstrap.normalizePort('0')).toBe(0);
         expect(Bootstrap.normalizePort('-1')).toBe(false);

test/unit/core/Bootstrap.test.ts

@@ -0,0 +1,27 @@
+import { Log } from '../../../src/core/log';
+
+
+export class LogMock extends Log {
+
+    public debugMock = jest.fn();
+    public infoMock = jest.fn();
+    public warnMock = jest.fn();
+    public errorMock = jest.fn();
+
+    public debug(message: string, ...args: any[]): void {
+        this.debugMock('debug', message, args);
+    }
+
+    public info(message: string, ...args: any[]): void {
+        this.infoMock('info', message, args);
+    }
+
+    public warn(message: string, ...args: any[]): void {
+        this.warnMock('warn', message, args);
+    }
+
+    public error(message: string, ...args: any[]): void {
+        this.errorMock('error', message, args);
+    }
+
+}

test/unit/lib/LogMock.ts

@@ -0,0 +1,2 @@
+// Helps to add metadata to classes with annotations
+import 'reflect-metadata';