fix: unhandled rejections now handled

Author: Tapani Moilanen

index.js

@@ -148,7 +148,7 @@ add.uncaughtExceptionHandler = function (hook) {
 
 	if (errHooks.length === 1) {
 		process.once('uncaughtException', exit.bind(null, true, 1));
-		process.once('uncaughtRejection', exit.bind(null, true, 1));
+		process.once('unhandledRejection', exit.bind(null, true, 1));
 	}
 };
 

test/cases/stub.js

@@ -28,30 +28,41 @@ exports.addCheck = function (num) {
 
 	// Only call exit once, and save uncaught errors
 	var called = false;
-	var ucErr;
+	var ucErrStr;
 
 	// Save errors that do not start with 'test'
 	process.on('uncaughtException', function (err) {
 		if (err.message.indexOf('test') !== 0) {
-			ucErr = err;
+			ucErrStr = err.stack;
+		}
+	});
+	// Save rejections that do not start with 'test'
+	process.on('unhandledRejection', function (reason) {
+		if ((reason.message || reason).indexOf('test') !== 0) {
+			ucErrStr = reason.message || reason;
 		}
 	});
 
 	// Check that there were no unexpected errors and all callbacks were called
-	process.once('exit', function () {
+	function onExitCheck(timeout) {
 		if (called) {
 			return;
 		}
 		called = true;
 
-		if (ucErr) {
-			exports.reject(ucErr.stack);
+		if (timeout) {
+			exports.reject('Test timed out');
+		} else if (ucErrStr) {
+			exports.reject(ucErrStr);
 		} else if (c === num) {
 			exports.done();
 		} else {
 			exports.reject('Expected ' + num + ' callback calls, but ' + c + ' received');
 		}
-	});
+	}
+
+	process.once('exit', onExitCheck.bind(null, null));
+	setTimeout(onExitCheck.bind(null, true), 10000);
 };
 
 // If the check isn't added, throw on exit

test/cases/unhandled-promise.js

@@ -0,0 +1,37 @@
+'use strict';
+var exitHook = require('./../../index');
+var stub = require('./stub');
+
+exitHook(function (cb) {
+	setTimeout(function () {
+		stub.called();
+		cb();
+	}, 50);
+	stub.called();
+});
+
+exitHook(function () {
+	stub.called();
+});
+
+exitHook.uncaughtExceptionHandler(function (err, cb) {
+	setTimeout(function () {
+		stub.called();
+		cb();
+	}, 50);
+	if (!err || err.message !== 'test-promise') {
+		stub.reject(`No error passed to uncaughtExceptionHandler, or message not test-promise - ${err.message}`);
+	}
+	stub.called();
+});
+
+process.on('unhandledRejection', function () {
+	// All uncaught rejection handlers should be called even though the exit hook handler was registered
+	stub.called();
+});
+
+stub.addCheck(6);
+
+(() => {
+	return Promise.reject(new Error('test-promise'));
+})();

test/tests.js

@@ -103,3 +103,12 @@ test('async exit timeout', t => {
 			t.is(code, 0);
 		});
 });
+
+test('unhandled promise rejection', t => {
+	t.plan(2);
+	return testInSub('unhandled-promise')
+		.then(([code, output]) => {
+			t.is(output, 'SUCCESS');
+			t.is(code, 0);
+		});
+});