Browse files

Release 1.4.2

  • Loading branch information...
1 parent 41a075e commit 8eaed5e9344c076ac61e124f5ea48fe58222f6b0 @tj tj committed Sep 1, 2012
Showing with 18 additions and 2 deletions.
  1. +12 −0 History.md
  2. +5 −1 mocha.js
  3. +1 −1 package.json
View
12 History.md
@@ -1,4 +1,16 @@
+1.4.2 / 2012-09-01
+==================
+
+ * add support to multiple `Mocha#globals()` calls, and strings
+ * add `mocha.reporter()` constructor support [joliss]
+ * add `mocha.timeout()`
+ * move query-string parser to utils.js
+ * move highlight code to utils.js
+ * fix third-party reporter support [exogen]
+ * fix client-side API to match node-side [jfirebaugh]
+ * fix mocha in iframe [joliss]
+
1.4.1 / 2012-08-28
==================
View
6 mocha.js
@@ -1026,7 +1026,11 @@ Mocha.prototype.reporter = function(reporter){
this._reporter = reporter;
} else {
reporter = reporter || 'dot';
- this._reporter = require('./reporters/' + reporter);
+ try {
+ this._reporter = require('./reporters/' + reporter);
+ } catch (err) {
+ this._reporter = require(reporter);
+ }
if (!this._reporter) throw new Error('invalid reporter "' + reporter + '"');
}
return this;
View
2 package.json
@@ -1,6 +1,6 @@
{
"name": "mocha"
- , "version": "1.4.1"
+ , "version": "1.4.2"
, "description": "simple, flexible, fun test framework"
, "keywords": ["test", "bdd", "tdd", "tap"]
, "author": "TJ Holowaychuk <tj@vision-media.ca>"

0 comments on commit 8eaed5e

Please sign in to comment.