add more unit tests

Author: manwaring

src/api/api-wrapper.test.ts

@@ -0,0 +1,48 @@
+import createEvent from '@serverless/event-mocks';
+import { apiWrapper, ApiSignature } from './api-wrapper';
+
+describe('API wrapper', () => {
+  // @ts-ignore
+  const event = createEvent('aws:apiGateway', {});
+
+  it('Handles success callback', () => {
+    function mockHandler({ success }: ApiSignature) {
+      return success('success');
+    }
+    expect(apiWrapper(mockHandler)(event)).toEqual({
+      body: JSON.stringify('success'),
+      headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Credentials': true },
+      statusCode: 200
+    });
+  });
+
+  it('Handles error callback', () => {
+    function mockHandler({ error }: ApiSignature) {
+      return error('error');
+    }
+    expect(() => {
+      apiWrapper(mockHandler)(event);
+    }).toThrow('error');
+  });
+
+  it('Handles invalid callback', () => {
+    function mockHandler({ invalid }: ApiSignature) {
+      return invalid(['invalid']);
+    }
+    expect(apiWrapper(mockHandler)(event)).toEqual({
+      body: JSON.stringify({ errors: ['invalid'], event }),
+      headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Credentials': true },
+      statusCode: 400
+    });
+  });
+
+  it('Handles redirect callback', () => {
+    function mockHandler({ redirect }: ApiSignature) {
+      return redirect('url');
+    }
+    expect(apiWrapper(mockHandler)(event)).toEqual({
+      headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Credentials': true, Location: 'url' },
+      statusCode: 302
+    });
+  });
+});

src/api/api.ts renamed to src/api/api-wrapper.ts

@@ -1,5 +1,6 @@
 import { APIGatewayEvent, Context, Callback } from 'aws-lambda';
-import { Metrics, Body } from '../common';
+import { Metrics } from '../common';
+import { Body } from './body';
 
 const metrics = new Metrics('API Gateway');
 
@@ -9,35 +10,35 @@ const HEADERS = {
 };
 
 export function apiWrapper<T extends Function>(fn: T): T {
-  return <any>function(event: APIGatewayEvent, context: Context, callback: Callback) {
+  return <any>function(event: APIGatewayEvent) {
     const { body, path, query, request, auth, headers, testRequest } = getRequestFields(event);
     metrics.common(request);
 
-    function success(payload: any = null): void {
+    function success(payload: any = null) {
       const response = { statusCode: 200, headers: HEADERS };
       if (payload) {
         response['body'] = JSON.stringify(payload);
       }
       metrics.success(payload);
-      return callback(null, response);
+      return response;
     }
 
-    function invalid(errors: string[] = []): void {
-      const response = { statusCode: 400, headers: HEADERS, body: JSON.stringify({ errors, request }) };
+    function invalid(errors: string[] = []) {
+      const response = { statusCode: 400, headers: HEADERS, body: JSON.stringify({ errors, event }) };
       metrics.invalid(response);
-      return callback(null, response);
+      return response;
     }
 
-    function redirect(url: string): void {
+    function redirect(url: string) {
       HEADERS['Location'] = url;
       const response = { statusCode: 302, headers: HEADERS };
       metrics.redirect(response);
-      return callback(null, response);
+      return response;
     }
 
-    function error(error: any = ''): void {
+    function error(error: any = '') {
       metrics.error(error);
-      return callback(error);
+      throw new Error(error);
     }
 
     const signature: ApiSignature = {

src/common/body.test.ts renamed to src/api/body.test.ts

@@ -1,5 +1,5 @@
 import { parse } from 'querystring';
-import { logger } from './log';
+import { logger } from '../common/log';
 
 export class Body {
   constructor(private body: any, private headers: { [name: string]: string }) {}

src/common/body.ts renamed to src/api/body.ts

@@ -1 +1 @@
-export * from './api';
+export * from './api-wrapper';

src/api/index.ts

@@ -11,17 +11,17 @@ export function authWrapper<T extends Function>(fn: T): T {
     function valid(jwt: any): void {
       const policy = generatePolicy(jwt);
       metrics.valid(policy);
-      return callback(null, policy);
+      return policy;
     }
 
     function invalid(message: any = ''): void {
       metrics.invalid(message);
-      return callback('Unauthorized');
+      throw new Error('Unauthorized');
     }
 
     function error(error: any = ''): void {
       metrics.error(error);
-      return callback(error);
+      throw new Error(error);
     }
 
     const signature: AuthorizerSignature = { event, token, valid, invalid, error };

src/auth/auth.ts

@@ -1,3 +1,2 @@
 export * from './log';
 export * from './metrics';
-export * from './body';

src/common/index.ts

@@ -108,7 +108,6 @@ describe('Stream parsing', () => {
       tableArn: 'arn:aws:dynamodb:us-east-1:1234567890:table/table',
       eventName: 'PUT'
     };
-
     expect(versions).toHaveLength(2);
     expect(versions).toContainEqual(firstVersion);
     expect(versions).toContainEqual(secondVersion);