☕️ Classic, reliable, trusted test framework for Node.js and the browser
add inline ms.js for now
TJ Holowaychuk5e024719eeef
diff --git a/lib/ms.js b/lib/ms.jsnew file mode 100644index 00000000..83b87c46--- /dev/null+++ b/lib/ms.js@@ -0,0 +1,81 @@++/**+ * 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+ */++module.exports = 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] || 'ms').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 filediff --git a/lib/reporters/base.js b/lib/reporters/base.jsindex 80055bc7..8e75a0d8 100644--- a/lib/reporters/base.js+++ b/lib/reporters/base.js@@ -5,7 +5,7 @@var tty = require('tty'), diff = require('diff')- , ms = require('ms');+ , ms = require('../ms');/*** Save timer references to avoid Sinon interfering (see GH-237).diff --git a/lib/suite.js b/lib/suite.jsindex c726ccb6..869bb88d 100644--- a/lib/suite.js+++ b/lib/suite.js@@ -5,7 +5,7 @@var EventEmitter = require('events').EventEmitter, debug = require('debug')('mocha:suite')- , milliseconds = require('ms')+ , milliseconds = require('./ms'), utils = require('./utils'), Hook = require('./hook');diff --git a/mocha.js b/mocha.jsindex 3b12d439..3e7bf1c4 100644--- a/mocha.js+++ b/mocha.js@@ -1222,6 +1222,90 @@ Mocha.prototype.run = function(fn){}); // module: mocha.js+require.register("ms.js", function(module, exports, require){++/**+ * 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+ */++module.exports = 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] || 'ms').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';+}+}); // module: ms.js+require.register("reporters/base.js", function(module, exports, require){/**@@ -1230,7 +1314,7 @@ require.register("reporters/base.js", function(module, exports, require){var tty = require('browser/tty'), diff = require('browser/diff')- , ms = require('ms');+ , ms = require('../ms');/*** Save timer references to avoid Sinon interfering (see GH-237).@@ -4033,7 +4117,7 @@ require.register("suite.js", function(module, exports, require){var EventEmitter = require('browser/events').EventEmitter, debug = require('browser/debug')('mocha:suite')- , milliseconds = require('ms')+ , milliseconds = require('./ms'), utils = require('./utils'), Hook = require('./hook');