Unified Handler Tests

test/exception-handler.test.js

@@ -6,7 +6,6 @@
  *
  */
 
-const stream = require('stream');
 const assume = require('assume');
 const mocha = require('mocha');
 const winston = require('../lib/winston');
@@ -38,6 +37,7 @@ describe('ExceptionHandler', function () {
 
   it('new ExceptionHandler()', function () {
     assume(function () {
+      // eslint-disable-next-line no-new
       new winston.ExceptionHandler();
     }).throws(/Logger is required/);
   });
@@ -70,21 +70,18 @@ describe('ExceptionHandler', function () {
 
   it('.handle()', function (done) {
     var existing = helpers.clearExceptions();
-    var writeable = new stream.Writable({
-      objectMode: true,
-      write: function (info) {
-        assume(info).is.an('object');
-        assume(info.error).is.an('error');
-        assume(info.error.message).equals('wtf this error');
-        assume(info.message).includes('uncaughtException: wtf this error');
-        assume(info.stack).is.a('string');
-        assume(info.process).is.an('object');
-        assume(info.os).is.an('object');
-        assume(info.trace).is.an('array');
-
-        existing.restore();
-        done();
-      }
+    var writeable = helpers.writeable(function (info) {
+      assume(info).is.an('object');
+      assume(info.error).is.an('error');
+      assume(info.error.message).equals('wtf this error');
+      assume(info.message).includes('uncaughtException: wtf this error');
+      assume(info.stack).is.a('string');
+      assume(info.process).is.an('object');
+      assume(info.os).is.an('object');
+      assume(info.trace).is.an('array');
+
+      existing.restore();
+      done();
     });
 
     var transport = new winston.transports.Stream({ stream: writeable });
@@ -93,7 +90,7 @@ describe('ExceptionHandler', function () {
       transports: [transport]
     });
 
-    assume(handler.catcher).equals(undefined);
+    assume(handler.catcher).is.a('undefined');
 
     transport.handleExceptions = true;
     handler.handle();

test/helpers/index.js

@@ -8,11 +8,9 @@
 
 const assume = require('assume'),
     fs = require('fs'),
-    path = require('path'),
     through = require('through2'),
     spawn = require('child_process').spawn,
     stream = require('stream'),
-    util = require('util'),
     winston = require('../../lib/winston'),
     mockTransport = require('./mocks/mock-transport');
 
@@ -125,9 +123,7 @@ helpers.throw = function (msg) {
  * @param {String} msg Error mesage to use
  */
 helpers.reject = function (msg) {
-  return new Promise((resolve, reject) => {
-    reject(msg);
-  });
+  return Promise.reject(msg);
 };
 
 /**

test/rejection-handler.test.js

@@ -6,7 +6,6 @@
  *
  */
 
-const stream = require('stream');
 const assume = require('assume');
 const mocha = require('mocha');
 const winston = require('../lib/winston');
@@ -38,6 +37,7 @@ describe('UnhandledRejectionHandler', function () {
 
   it('new RejectionHandler()', function () {
     assume(function () {
+      // eslint-disable-next-line no-new
       new winston.RejectionHandler();
     }).throws(/Logger is required/);
   });
@@ -70,21 +70,19 @@ describe('UnhandledRejectionHandler', function () {
 
   it('.handle()', function (done) {
     var existing = helpers.clearRejections();
-    var writeable = new stream.Writable({
-      objectMode: true,
-      write: function (info) {
-        assume(info).is.an('object');
-        assume(info.error).is.an('error');
-        assume(info.error.message).equals('wtf this rejection');
-        assume(info.message).includes('unhandledRejection: wtf this rejection');
-        assume(info.stack).is.a('string');
-        assume(info.process).is.an('object');
-        assume(info.os).is.an('object');
-        assume(info.trace).is.an('array');
-
-        existing.restore();
-        done();
-      }
+    var writeable = helpers.writeable(function (info) {
+      console.log('in writeable', info);
+      assume(info).is.an('object');
+      assume(info.error).is.an('error');
+      assume(info.error.message).equals('wtf this rejection');
+      assume(info.message).includes('unhandledRejection: wtf this rejection');
+      assume(info.stack).is.a('string');
+      assume(info.process).is.an('object');
+      assume(info.os).is.an('object');
+      assume(info.trace).is.an('array');
+
+      existing.restore();
+      done();
     });
 
     var transport = new winston.transports.Stream({ stream: writeable });
@@ -93,7 +91,7 @@ describe('UnhandledRejectionHandler', function () {
       transports: [transport]
     });
 
-    assume(handler.catcher).equals(undefined);
+    assume(handler.catcher).is.a('undefined');
 
     transport.handleRejections = true;
     handler.handle();
@@ -103,7 +101,14 @@ describe('UnhandledRejectionHandler', function () {
       handler.catcher
     ]);
 
-    helpers.reject('wtf this rejection').then(done());
+    const meh = (e) => console.log('my handler', e);
+    process.on('unhandledRejection', meh);
+    assume(process.listeners('unhandledRejection')).deep.equals([
+      handler.catcher,
+      meh
+    ]);
+
+    process.emit('unhandledRejection', helpers.reject('wtf this rejection'));
   });
 
   it('.getAllInfo(undefined)', function () {