☕️ Classic, reliable, trusted test framework for Node.js and the browser
Fix exception when skipping tests programmatically (#4165)
Juerg B0be3f78491bb
diff --git a/lib/runner.js b/lib/runner.jsindex bf1d14b1..ceb1a24a 100644--- a/lib/runner.js+++ b/lib/runner.js@@ -654,7 +654,7 @@ Runner.prototype.runTests = function(suite, fn) {self.emit(constants.EVENT_TEST_END, test);// skip inner afterEach hooks below errSuite levelvar origSuite = self.suite;- self.suite = errSuite;+ self.suite = errSuite || self.suite;return self.hookUp(HOOK_TYPE_AFTER_EACH, function(e, eSuite) {self.suite = origSuite;next(e, eSuite);diff --git a/test/integration/fixtures/pending/programmatic.fixture.js b/test/integration/fixtures/pending/programmatic.fixture.jsnew file mode 100644index 00000000..65720be6--- /dev/null+++ b/test/integration/fixtures/pending/programmatic.fixture.js@@ -0,0 +1,8 @@+'use strict';+const Mocha = require('../../../../lib/mocha');++const mocha = new Mocha({reporter: 'json'});+mocha.addFile("./test/integration/fixtures/__default__.fixture.js");++const runner = mocha.run();+runner.on('test', function (test) { test.pending = true; });diff --git a/test/integration/helpers.js b/test/integration/helpers.jsindex 78251c98..0d65e91e 100644--- a/test/integration/helpers.js+++ b/test/integration/helpers.js@@ -143,6 +143,8 @@ module.exports = {invokeMochaAsync: invokeMochaAsync,+ invokeNode: invokeNode,+/*** Resolves the path to a fixture to the full path.*/@@ -227,6 +229,19 @@ function invokeMochaAsync(args, opts) {return [mochaProcess, resultPromise];}+/**+ * Invokes Node without Mocha binary with the given arguments,+ * when Mocha is used programmatically.+ */+function invokeNode(args, fn, opts) {+ if (typeof args === 'function') {+ opts = fn;+ fn = args;+ args = [];+ }+ return _spawnMochaWithListeners(args, fn, opts);+}+function invokeSubMocha(args, fn, opts) {if (typeof args === 'function') {opts = fn;diff --git a/test/integration/pending.spec.js b/test/integration/pending.spec.jsindex 7179ff18..ae6a57f0 100644--- a/test/integration/pending.spec.js+++ b/test/integration/pending.spec.js@@ -1,9 +1,12 @@'use strict';var assert = require('assert');-var run = require('./helpers').runMochaJSON;-var runMocha = require('./helpers').runMocha;-var splitRegExp = require('./helpers').splitRegExp;+var helpers = require('./helpers');+var run = helpers.runMochaJSON;+var runMocha = helpers.runMocha;+var splitRegExp = helpers.splitRegExp;+var invokeNode = helpers.invokeNode;+var toJSONRunResult = helpers.toJSONRunResult;var args = [];describe('pending', function() {@@ -323,4 +326,21 @@ describe('pending', function() {});});});++ describe('programmatic usage', function() {+ it('should skip the test by listening to test event', function(done) {+ var path = require.resolve('./fixtures/pending/programmatic.fixture.js');+ invokeNode([path], function(err, res) {+ if (err) {+ return done(err);+ }+ var result = toJSONRunResult(res);+ expect(result, 'to have passed')+ .and('to have passed test count', 0)+ .and('to have pending test count', 1)+ .and('to have pending test order', 'should succeed');+ done();+ });+ });+ });});