☕️ Classic, reliable, trusted test framework for Node.js and the browser
add ms.js for durations
TJ Holowaychuk8ae0fd8636cc
diff --git a/lib/reporters/base.js b/lib/reporters/base.jsindex c8132960..1cbc00f0 100644--- a/lib/reporters/base.js+++ b/lib/reporters/base.js@@ -4,7 +4,8 @@*/var tty = require('tty')- , diff = require('diff');+ , diff = require('diff')+ , utils = require('../utils');/*** Save timer references to avoid Sinon interfering (see GH-237).@@ -290,12 +291,12 @@ Base.prototype.epilogue = function(){// passfmt = color('bright pass', ' ✔')+ color('green', ' %d %s complete')- + color('light', ' (%dms)');+ + color('light', ' (%s)');console.log(fmt,stats.tests || 0,pluralize(stats.tests),- stats.duration);+ utils.ms(stats.duration));// pendingif (stats.pending) {diff --git a/lib/utils.js b/lib/utils.jsindex bc2f6bed..7494a590 100644--- a/lib/utils.js+++ b/lib/utils.js@@ -282,4 +282,87 @@ exports.highlightTags = function(name) {for (var i = 0, len = code.length; i < len; ++i) {code[i].innerHTML = highlight(code[i].innerHTML);}-};\ No newline at end of file+};++// TODO: use ms.js when published++/**+ * Helpers.+ */++var s = 1000;+var m = s * 60;+var h = m * 60;+var d = h * 24;++/**+ * Parse or format the given `val`.+ *+ * @param {String|Number} val+ * @return {String|Number}+ * @api public+ */++exports.ms = function(val){+ if ('string' == typeof val) return parse(val);+ return format(val);+};++/**+ * Parse the given `str` and return milliseconds.+ *+ * @param {String} str+ * @return {Number}+ * @api private+ */++function parse(str) {+ var m = /^((?:\d+)?\.?\d+) *(ms|seconds?|s|minutes?|m|hours?|h|days?|d|years?|y)$/i.exec(str);+ if (!m) return;+ var n = parseFloat(m[1]);+ var type = m[2].toLowerCase();+ switch (type) {+ case 'years':+ case 'year':+ case 'y':+ return n * 31557600000;+ case 'days':+ case 'day':+ case 'd':+ return n * 86400000;+ case 'hours':+ case 'hour':+ case 'h':+ return n * 3600000;+ case 'minutes':+ case 'minute':+ case 'm':+ return n * 60000;+ case 'seconds':+ case 'second':+ case 's':+ return n * 1000;+ case 'ms':+ return n;+ }+}++/**+ * Format the given `ms`.+ *+ * @param {Number} ms+ * @return {String}+ * @api public+ */++function format(ms) {+ if (ms == d) return (ms / d) + ' day';+ if (ms > d) return (ms / d) + ' days';+ if (ms == h) return (ms / h) + ' hour';+ if (ms > h) return (ms / h) + ' hours';+ if (ms == m) return (ms / m) + ' minute';+ if (ms > m) return (ms / m) + ' minutes';+ if (ms == s) return (ms / s) + ' second';+ if (ms > s) return (ms / s) + ' seconds';+ return ms + ' ms';+}\ No newline at end of file