☕️ Classic, reliable, trusted test framework for Node.js and the browser
fix memory leak when run in v8; closes #3119
Christopher Hillerd975a6a8455e
diff --git a/lib/runnable.js b/lib/runnable.jsindex 694d4f59..e8ca4180 100644--- a/lib/runnable.js+++ b/lib/runnable.js@@ -53,7 +53,6 @@ function Runnable (title, fn) {this._slow = 75;this._enableTimeouts = true;this.timedOut = false;- this._trace = new Error('done() called multiple times');this._retries = -1;this._currentRetry = 0;this.pending = false;@@ -278,7 +277,13 @@ Runnable.prototype.run = function (fn) {return;}emitted = true;- self.emit('error', err || new Error('done() called multiple times; stacktrace may be inaccurate'));+ var msg = 'done() called multiple times';+ if (err && err.message) {+ err.message += " (and Mocha's " + msg + ')';+ self.emit('error', err);+ } else {+ self.emit('error', new Error(msg));+ }}// finished@@ -287,8 +292,9 @@ Runnable.prototype.run = function (fn) {if (self.timedOut) {return;}+if (finished) {- return multiple(err || self._trace);+ return multiple(err);}self.clearTimeout();diff --git a/test/integration/fixtures/multiple-done-with-error.fixture.js b/test/integration/fixtures/multiple-done-with-error.fixture.jsnew file mode 100644index 00000000..4d4c55c7--- /dev/null+++ b/test/integration/fixtures/multiple-done-with-error.fixture.js@@ -0,0 +1,8 @@+'use strict';++it('should fail in a test-case', function (done) {+ process.nextTick(function () {+ done();+ done(new Error('second error'));+ });+});diff --git a/test/integration/multiple-done.spec.js b/test/integration/multiple-done.spec.jsindex 76a64831..3ac216e4 100644--- a/test/integration/multiple-done.spec.js+++ b/test/integration/multiple-done.spec.js@@ -15,15 +15,35 @@ describe('multiple calls to done()', function () {});it('results in failures', function () {- assert.equal(res.stats.pending, 0);- assert.equal(res.stats.passes, 1);- assert.equal(res.stats.failures, 1);- assert.equal(res.code, 1);+ assert.equal(res.stats.pending, 0, 'wrong "pending" count');+ assert.equal(res.stats.passes, 1, 'wrong "passes" count');+ assert.equal(res.stats.failures, 1, 'wrong "failures" count');});it('throws a descriptive error', function () {- assert.equal(res.failures[0].err.message,- 'done() called multiple times');+ assert.equal(res.failures[0].err.message, 'done() called multiple times');+ });+ });++ describe('with error passed on second call', function () {+ before(function (done) {+ run('multiple-done-with-error.fixture.js', args, function (err, result) {+ res = result;+ done(err);+ });+ });++ it('results in failures', function () {+ assert.equal(res.stats.pending, 0, 'wrong "pending" count');+ assert.equal(res.stats.passes, 1, 'wrong "passes" count');+ assert.equal(res.stats.failures, 1, 'wrong "failures" count');+ });++ it('should throw a descriptive error', function () {+ assert.equal(+ res.failures[0].err.message,+ "second error (and Mocha's done() called multiple times)"+ );});});@@ -44,8 +64,7 @@ describe('multiple calls to done()', function () {it('correctly attributes the error', function () {assert.equal(res.failures[0].fullTitle, 'suite test1');- assert.equal(res.failures[0].err.message,- 'done() called multiple times');+ assert.equal(res.failures[0].err.message, 'done() called multiple times');});});@@ -66,8 +85,7 @@ describe('multiple calls to done()', function () {it('correctly attributes the error', function () {assert.equal(res.failures[0].fullTitle, 'suite "before all" hook');- assert.equal(res.failures[0].err.message,- 'done() called multiple times');+ assert.equal(res.failures[0].err.message, 'done() called multiple times');});});@@ -90,8 +108,7 @@ describe('multiple calls to done()', function () {assert.equal(res.failures.length, 2);res.failures.forEach(function (failure) {assert.equal(failure.fullTitle, 'suite "before each" hook');- assert.equal(failure.err.message,- 'done() called multiple times');+ assert.equal(failure.err.message, 'done() called multiple times');});});});diff --git a/test/unit/runnable.spec.js b/test/unit/runnable.spec.jsindex c67366b6..b7f2cecb 100644--- a/test/unit/runnable.spec.js+++ b/test/unit/runnable.spec.js@@ -270,7 +270,8 @@ describe('Runnable(title, fn)', function () {test.on('error', function (err) {++errCalls;- expect(err.message).to.equal('fail');+ expect(err.message).to.equal(+ "fail (and Mocha's done() called multiple times)");expect(calls).to.equal(1);expect(errCalls).to.equal(1);done();