From 9f02a2a91f019ed7de8987113ba37963dac42300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0mol=C3=ADk?= Date: Fri, 22 Nov 2019 09:16:32 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20testWriteStream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tests/express.test.ts | 12 +----------- src/tests/index.test.ts | 12 +----------- src/tests/utils.ts | 12 ++++++++++++ 3 files changed, 14 insertions(+), 22 deletions(-) create mode 100644 src/tests/utils.ts diff --git a/src/tests/express.test.ts b/src/tests/express.test.ts index a77d07a..48dc1a9 100644 --- a/src/tests/express.test.ts +++ b/src/tests/express.test.ts @@ -3,6 +3,7 @@ import 'jest-extended'; import { Writable } from 'stream'; import * as supertest from 'supertest'; import { levels } from '../levels'; +import { testWriteStream } from './utils'; let loggerFactory; @@ -11,17 +12,6 @@ beforeEach(() => { loggerFactory = require('..').default; }); -const testWriteStream = (resolve, assert) => ({ - stream: new Writable({ - write: (chunk, encoding, next) => { - const json = JSON.parse(chunk); - assert(json); - next(); - resolve(); - }, - }), -}); - test('express binds', () => { const logger = loggerFactory(); const app = express(); diff --git a/src/tests/index.test.ts b/src/tests/index.test.ts index 7d07c23..2c5b3f3 100644 --- a/src/tests/index.test.ts +++ b/src/tests/index.test.ts @@ -3,6 +3,7 @@ import isString = require('lodash.isstring'); import { Writable } from 'stream'; import loggerFactory, { pkgVersionKey, loggerNameKey } from '..'; import { levels } from '../levels'; +import { testWriteStream } from './utils'; test('can create default logger', () => { const logger = loggerFactory(); @@ -21,17 +22,6 @@ test('can create logger with options', () => { expect(logger.options.pretty).toBe(true); }); -const testWriteStream = (resolve, assert, isJson = true) => ({ - stream: new Writable({ - write: (chunk, encoding, next) => { - const json = isJson ? JSON.parse(chunk) : chunk.toString(); - assert(json); - next(); - resolve(); - }, - }), -}); - test('can use custom stream', () => new Promise((resolve, reject) => { const logger = loggerFactory({ diff --git a/src/tests/utils.ts b/src/tests/utils.ts new file mode 100644 index 0000000..f5f391b --- /dev/null +++ b/src/tests/utils.ts @@ -0,0 +1,12 @@ +import { Writable } from 'stream'; + +export const testWriteStream = (resolve, assert, isJson = true) => ({ + stream: new Writable({ + write: (chunk, encoding, next) => { + const json = isJson ? JSON.parse(chunk) : chunk.toString(); + assert(json); + next(); + resolve(); + }, + }), +}); \ No newline at end of file