From 65013ee2263c96802252be943991f7b14fb8621f Mon Sep 17 00:00:00 2001 From: Vlad Holubiev Date: Thu, 5 Sep 2019 21:25:14 +0300 Subject: [PATCH] test: rewrite "packages/http-header-normalizer" tests to async/await fixes #270 --- .../http-header-normalizer/__tests__/index.js | 49 ++++++++----------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/packages/http-header-normalizer/__tests__/index.js b/packages/http-header-normalizer/__tests__/index.js index 51ea24e1c..b0805d789 100644 --- a/packages/http-header-normalizer/__tests__/index.js +++ b/packages/http-header-normalizer/__tests__/index.js @@ -1,8 +1,9 @@ +const { invoke } = require('../../test-helpers') const middy = require('../../core') const httpHeaderNormalizer = require('../') describe('👺 Middleware Http Header Normalizer', () => { - test('It should normalize (lowercase) all the headers and create a copy in rawHeaders', (endTest) => { + test('It should normalize (lowercase) all the headers and create a copy in rawHeaders', async () => { const handler = middy((event, context, cb) => cb(null, event)) handler @@ -28,15 +29,13 @@ describe('👺 Middleware Http Header Normalizer', () => { const originalHeaders = Object.assign({}, event.headers) - // run the handler - handler(event, {}, (_, resultingEvent) => { - expect(resultingEvent.headers).toEqual(expectedHeaders) - expect(resultingEvent.rawHeaders).toEqual(originalHeaders) - endTest() - }) + const resultingEvent = await invoke(handler, event) + + expect(resultingEvent.headers).toEqual(expectedHeaders) + expect(resultingEvent.rawHeaders).toEqual(originalHeaders) }) - test('It should normalize (canonical) all the headers and create a copy in rawHeaders', (endTest) => { + test('It should normalize (canonical) all the headers and create a copy in rawHeaders', async () => { const handler = middy((event, context, cb) => cb(null, event)) handler @@ -62,15 +61,13 @@ describe('👺 Middleware Http Header Normalizer', () => { const originalHeaders = Object.assign({}, event.headers) - // run the handler - handler(event, {}, (_, resultingEvent) => { - expect(resultingEvent.headers).toEqual(expectedHeaders) - expect(resultingEvent.rawHeaders).toEqual(originalHeaders) - endTest() - }) + const resultingEvent = await invoke(handler, event) + + expect(resultingEvent.headers).toEqual(expectedHeaders) + expect(resultingEvent.rawHeaders).toEqual(originalHeaders) }) - test('It can use custom normalization function', (endTest) => { + test('It can use custom normalization function', async () => { const normalizeHeaderKey = (key) => key.toUpperCase() const handler = middy((event, context, cb) => cb(null, event)) @@ -100,15 +97,13 @@ describe('👺 Middleware Http Header Normalizer', () => { const originalHeaders = Object.assign({}, event.headers) - // run the handler - handler(event, {}, (_, resultingEvent) => { - expect(resultingEvent.headers).toEqual(expectedHeaders) - expect(resultingEvent.rawHeaders).toEqual(originalHeaders) - endTest() - }) + const resultingEvent = await invoke(handler, event) + + expect(resultingEvent.headers).toEqual(expectedHeaders) + expect(resultingEvent.rawHeaders).toEqual(originalHeaders) }) - test('It should not fail if the event does not contain headers', (endTest) => { + test('It should not fail if the event does not contain headers', async () => { const handler = middy((event, context, cb) => cb(null, event)) handler @@ -122,11 +117,9 @@ describe('👺 Middleware Http Header Normalizer', () => { foo: 'bar' } - // run the handler - handler(event, {}, (_, resultingEvent) => { - expect(resultingEvent).toEqual(expectedEvent) - expect(resultingEvent.rawHeaders).toBeUndefined() - endTest() - }) + const resultingEvent = await invoke(handler, event) + + expect(resultingEvent).toEqual(expectedEvent) + expect(resultingEvent.rawHeaders).toBeUndefined() }) })