Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

add "ms" dep, remove inline util

TJ Holowaychuk0e28a33805ad
diff --git a/lib/reporters/base.js b/lib/reporters/base.js
index 493ca317..29b237fc 100644
--- a/lib/reporters/base.js
+++ b/lib/reporters/base.js
@@ -5,7 +5,7 @@
var tty = require('tty')
, diff = require('diff')
- , utils = require('../utils');
+ , ms = require('ms');
/**
* Save timer references to avoid Sinon interfering (see GH-237).
@@ -296,7 +296,7 @@ Base.prototype.epilogue = function(){
console.log(fmt,
stats.tests || 0,
pluralize(stats.tests),
- utils.ms(stats.duration));
+ ms(stats.duration));
// pending
if (stats.pending) {
diff --git a/lib/utils.js b/lib/utils.js
index 7494a590..c9942c38 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -283,86 +283,3 @@ exports.highlightTags = function(name) {
code[i].innerHTML = highlight(code[i].innerHTML);
}
};
-
-// 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
diff --git a/package.json b/package.json
index 3b460837..926dad1d 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
, "diff": "1.0.2"
, "debug": "*"
, "mkdirp": "0.3.3"
+ , "ms": "0.2.0"
}
, "devDependencies": {
"should": "*"