[Refactor] minor cleanups

Author: ljharb

index.js

@@ -1,10 +1,11 @@
 'use strict';
 
 var defined = require('defined');
+var through = require('@ljharb/through');
+
 var createDefaultStream = require('./lib/default_stream');
 var Test = require('./lib/test');
 var Results = require('./lib/results');
-var through = require('@ljharb/through');
 
 var canEmitExit = typeof process !== 'undefined' && process
 	&& typeof process.on === 'function' && process.browser !== true;

lib/default_stream.js

@@ -3,6 +3,8 @@
 var through = require('@ljharb/through');
 var fs = require('fs');
 
+var isObject = require('./isObject');
+
 module.exports = function () {
 	var line = '';
 	var stream = through(write, flush);
@@ -11,7 +13,7 @@ module.exports = function () {
 	function write(buf) {
 		if (
 			buf == null // eslint-disable-line eqeqeq
-			|| (Object(buf) !== buf && typeof buf !== 'string')
+			|| (!isObject(buf) && typeof buf !== 'string')
 		) {
 			flush();
 			return;

lib/isObject.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = function isObject(x) {
+	return Object(x) === x;
+};

lib/test.js

@@ -112,6 +112,10 @@ function Test(name_, opts_, cb_) {
 
 inherits(Test, EventEmitter);
 
+function isPromiseLike(x) {
+	return x && typeof x.then === 'function';
+}
+
 Test.prototype.run = function run() {
 	this.emit('prerun');
 	if (!this._cb || this._skip) {
@@ -124,11 +128,7 @@ Test.prototype.run = function run() {
 
 	var callbackReturn = this._cb(this);
 
-	if (
-		typeof Promise === 'function'
-        && callbackReturn
-        && typeof callbackReturn.then === 'function'
-	) {
+	if (typeof Promise === 'function' && isPromiseLike(callbackReturn)) {
 		var self = this;
 		Promise.resolve(callbackReturn).then(
 			function onResolve() {
@@ -423,7 +423,7 @@ Test.prototype._end = function _end(err) {
 		} catch (e) {
 			self.fail(e);
 		}
-		if (res && typeof res.then === 'function') {
+		if (isPromiseLike(res)) {
 			res.then(next, function (_err) {
 				// TODO: wth?
 				err = err || _err;
@@ -811,6 +811,8 @@ function notDeepLooseEqual(a, b, msg, extra) {
 Test.prototype.notDeepLooseEqual
 = notDeepLooseEqual;
 
+var isObject = require('./isObject');
+
 Test.prototype['throws'] = function (fn, expected, msg, extra) {
 	if (typeof expected === 'string') {
 		msg = expected;
@@ -823,7 +825,7 @@ Test.prototype['throws'] = function (fn, expected, msg, extra) {
 		fn();
 	} catch (err) {
 		caught = { error: err };
-		if (Object(err) === err && 'message' in err && (!isEnumerable(err, 'message') || !hasOwn(err, 'message'))) {
+		if (isObject(err) && 'message' in err && (!isEnumerable(err, 'message') || !hasOwn(err, 'message'))) {
 			try {
 				var message = err.message;
 				delete err.message;