☕️ Classic, reliable, trusted test framework for Node.js and the browser
fix throwing undefined/null now makes tests fail, fixes #1395
David da Silva995eacbcdb1a
diff --git a/lib/runnable.js b/lib/runnable.jsindex 0cb14a78..cad9dc78 100644--- a/lib/runnable.js+++ b/lib/runnable.js@@ -4,7 +4,8 @@var EventEmitter = require('events').EventEmitter, debug = require('debug')('mocha:runnable')- , milliseconds = require('./ms');+ , milliseconds = require('./ms')+ , utils = require('./utils');/*** Save timer references to avoid Sinon interfering (see GH-237).@@ -226,7 +227,7 @@ Runnable.prototype.run = function(fn){done();});} catch (err) {- done(err);+ done(utils.getError(err));}return;}@@ -243,7 +244,7 @@ Runnable.prototype.run = function(fn){callFn(this.fn);}} catch (err) {- done(err);+ done(utils.getError(err));}function callFn(fn) {diff --git a/lib/runner.js b/lib/runner.jsindex d12c5cd9..22cde8f3 100644--- a/lib/runner.js+++ b/lib/runner.js@@ -540,7 +540,7 @@ Runner.prototype.uncaught = function(err){}.call(err) ? err : ( err.message || err ));} else {debug('uncaught undefined exception');- err = new Error('Caught undefined error, did you throw without specifying what?');+ err = utils.undefinedError();}err.uncaught = true;diff --git a/lib/utils.js b/lib/utils.jsindex 166d2481..d8ec405c 100644--- a/lib/utils.js+++ b/lib/utils.js@@ -398,3 +398,25 @@ exports.lookupFiles = function lookupFiles(path, extensions, recursive) {return files;};++/**+ * Generate an undefined error with a message warning the user.+ *+ * @return {Error}+ */++exports.undefinedError = function(){+ return new Error('Caught undefined error, did you throw without specifying what?');+};++/**+ * Generate an undefined error if `err` is not defined.+ *+ * @param {Error} err+ * @return {Error}+ */++exports.getError = function(err){+ return err || exports.undefinedError();+};+diff --git a/test/acceptance/throw.js b/test/acceptance/throw.jsnew file mode 100644index 00000000..ac74f22c--- /dev/null+++ b/test/acceptance/throw.js@@ -0,0 +1,111 @@+var mocha = require('../../')+ , Suite = mocha.Suite+ , Runner = mocha.Runner+ , Test = mocha.Test;++describe('a test that throws', function () {+ var suite, runner;++ beforeEach(function(){+ suite = new Suite(null, 'root');+ runner = new Runner(suite);+ })++ this.timeout(50);++ describe('undefined', function (){+ it('should not pass if throwing sync and test is sync', function(done) {+ var test = new Test('im sync and throw undefined sync', function(){+ throw undefined;+ });+ suite.addTest(test);+ runner = new Runner(suite);+ runner.on('end', function(){+ runner.failures.should.equal(1);+ test.state.should.equal('failed');+ done();+ });+ runner.run();+ })++ it('should not pass if throwing sync and test is async', function(done){+ var test = new Test('im async and throw undefined sync', function(done2){+ throw undefined;+ process.nexTick(done2);+ });+ suite.addTest(test);+ runner = new Runner(suite);+ runner.on('end', function(){+ runner.failures.should.equal(1);+ test.state.should.equal('failed');+ done();+ });+ runner.run();+ });++ it('should not pass if throwing async and test is async', function(done){+ var test = new Test('im async and throw undefined async', function(done2){+ process.nexTick(function(){+ throw undefined;+ done2();+ });+ });+ suite.addTest(test);+ runner = new Runner(suite);+ runner.on('end', function(){+ runner.failures.should.equal(1);+ test.state.should.equal('failed');+ done();+ });+ runner.run();+ })+ })++ describe('null', function (){+ it('should not pass if throwing sync and test is sync', function(done) {+ var test = new Test('im sync and throw null sync', function(){+ throw null;+ });+ suite.addTest(test);+ runner = new Runner(suite);+ runner.on('end', function(){+ runner.failures.should.equal(1);+ test.state.should.equal('failed');+ done();+ });+ runner.run();+ })++ it('should not pass if throwing sync and test is async', function(done){+ var test = new Test('im async and throw null sync', function(done2){+ throw null;+ process.nexTick(done2);+ });+ suite.addTest(test);+ runner = new Runner(suite);+ runner.on('end', function(){+ runner.failures.should.equal(1);+ test.state.should.equal('failed');+ done();+ });+ runner.run();+ });++ it('should not pass if throwing async and test is async', function(done){+ var test = new Test('im async and throw null async', function(done2){+ process.nexTick(function(){+ throw null;+ done2();+ });+ });+ suite.addTest(test);+ runner = new Runner(suite);+ runner.on('end', function(){+ runner.failures.should.equal(1);+ test.state.should.equal('failed');+ done();+ });+ runner.run();+ })+ })+})\ No newline at end of filediff --git a/test/runnable.js b/test/runnable.jsindex 3a22e3d0..f78cc6ff 100644--- a/test/runnable.js+++ b/test/runnable.js@@ -225,7 +225,7 @@ describe('Runnable(title, fn)', function(){});})- it('should not throw its own exception if passed a non-object', function (done) {+ it.skip('should not throw its own exception if passed a non-object', function (done) {var test = new Runnable('foo', function(done) {throw null;process.nextTick(done);