☕️ Classic, reliable, trusted test framework for Node.js and the browser
rename "forbid" fixture files to have proper extension; closes #3636
Christopher Hiller273f4790ea80
diff --git a/test/integration/fixtures/options/forbid-only/only-empty-suite.js b/test/integration/fixtures/options/forbid-only/only-empty-suite.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-only/only-empty-suite.jsrename to test/integration/fixtures/options/forbid-only/only-empty-suite.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-only/only-suite.js b/test/integration/fixtures/options/forbid-only/only-suite.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-only/only-suite.jsrename to test/integration/fixtures/options/forbid-only/only-suite.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-only/only.js b/test/integration/fixtures/options/forbid-only/only.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-only/only.jsrename to test/integration/fixtures/options/forbid-only/only.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-only/passed.js b/test/integration/fixtures/options/forbid-only/passed.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-only/passed.jsrename to test/integration/fixtures/options/forbid-only/passed.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-pending/before-this.skip.js b/test/integration/fixtures/options/forbid-pending/before-this-skip.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-pending/before-this.skip.jsrename to test/integration/fixtures/options/forbid-pending/before-this-skip.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-pending/beforeEach-this.skip.js b/test/integration/fixtures/options/forbid-pending/beforeEach-this-skip.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-pending/beforeEach-this.skip.jsrename to test/integration/fixtures/options/forbid-pending/beforeEach-this-skip.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-pending/passed.js b/test/integration/fixtures/options/forbid-pending/passed.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-pending/passed.jsrename to test/integration/fixtures/options/forbid-pending/passed.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-pending/pending.js b/test/integration/fixtures/options/forbid-pending/pending.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-pending/pending.jsrename to test/integration/fixtures/options/forbid-pending/pending.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-pending/skip-empty-suite.js b/test/integration/fixtures/options/forbid-pending/skip-empty-suite.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-pending/skip-empty-suite.jsrename to test/integration/fixtures/options/forbid-pending/skip-empty-suite.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-pending/skip-suite.js b/test/integration/fixtures/options/forbid-pending/skip-suite.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-pending/skip-suite.jsrename to test/integration/fixtures/options/forbid-pending/skip-suite.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-pending/skip.js b/test/integration/fixtures/options/forbid-pending/skip.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-pending/skip.jsrename to test/integration/fixtures/options/forbid-pending/skip.fixture.jsdiff --git a/test/integration/fixtures/options/forbid-pending/this.skip.js b/test/integration/fixtures/options/forbid-pending/this-skip.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/forbid-pending/this.skip.jsrename to test/integration/fixtures/options/forbid-pending/this-skip.fixture.jsdiff --git a/test/integration/helpers.js b/test/integration/helpers.jsindex d938bb9e..0680faa0 100644--- a/test/integration/helpers.js+++ b/test/integration/helpers.js@@ -30,6 +30,12 @@ module.exports = {* @param {Object} [opts] - Options for `spawn()`*/runMocha: function(fixturePath, args, fn, opts) {+ if (typeof args === 'function') {+ opts = fn;+ fn = args;+ args = [];+ }+var path;path = resolveFixturePath(fixturePath);@@ -61,6 +67,12 @@ module.exports = {* @returns {*} Parsed object*/runMochaJSON: function(fixturePath, args, fn, opts) {+ if (typeof args === 'function') {+ opts = fn;+ fn = args;+ args = [];+ }+var path;path = resolveFixturePath(fixturePath);@@ -208,6 +220,9 @@ function _spawnMochaWithListeners(args, fn, opts) {}function resolveFixturePath(fixture) {+ if (path.extname(fixture) !== '.js') {+ fixture += '.fixture.js';+ }return path.join('test', 'integration', 'fixtures', fixture);}diff --git a/test/integration/hook-err.spec.js b/test/integration/hook-err.spec.jsindex 5464ac18..dad50027 100644--- a/test/integration/hook-err.spec.js+++ b/test/integration/hook-err.spec.js@@ -1,7 +1,8 @@'use strict';-var runMocha = require('./helpers').runMocha;-var splitRegExp = require('./helpers').splitRegExp;+var helpers = require('./helpers');+var runMocha = helpers.runMocha;+var splitRegExp = helpers.splitRegExp;var bang = require('../../lib/reporters/base').symbols.bang;describe('hook error handling', function() {diff --git a/test/integration/options.spec.js b/test/integration/options.spec.jsindex 3a161393..81eac578 100644--- a/test/integration/options.spec.js+++ b/test/integration/options.spec.js@@ -374,7 +374,7 @@ describe('options', function() {});it('succeeds if there are only passed tests', function(done) {- runMochaJSON('options/forbid-only/passed.js', args, function(err, res) {+ runMochaJSON('options/forbid-only/passed', args, function(err, res) {if (err) {done(err);return;@@ -385,7 +385,7 @@ describe('options', function() {});it('fails if there are tests marked only', function(done) {- runMochaJSON('options/forbid-only/only.js', args, function(err, res) {+ runMochaJSON('options/forbid-only/only', args, function(err, res) {if (err) {done(err);return;@@ -397,7 +397,7 @@ describe('options', function() {it('fails if there are tests in suites marked only', function(done) {runMocha(- 'options/forbid-only/only-suite.js',+ 'options/forbid-only/only-suite',args,function(err, res) {if (err) {@@ -417,7 +417,7 @@ describe('options', function() {it('fails if there is empty suite marked only', function(done) {runMocha(- 'options/forbid-only/only-empty-suite.js',+ 'options/forbid-only/only-empty-suite',args,function(err, res) {if (err) {@@ -436,7 +436,7 @@ describe('options', function() {it('fails if there is suite marked only which matches a grep', function(done) {runMocha(- 'options/forbid-only/only-suite.js',+ 'options/forbid-only/only-suite',args.concat('--fgrep', 'suite marked with only'),function(err, res) {if (err) {@@ -455,7 +455,7 @@ describe('options', function() {it('succeeds if suite marked only does not match grep', function(done) {runMochaJSON(- 'options/forbid-only/only-suite.js',+ 'options/forbid-only/only-suite',args.concat('--fgrep', 'bumble bees'),function(err, res) {if (err) {@@ -470,7 +470,7 @@ describe('options', function() {it('succeeds if suite marked only does not match grep (using "invert")', function(done) {runMochaJSON(- 'options/forbid-only/only-suite.js',+ 'options/forbid-only/only-suite',args.concat('--fgrep', 'suite marked with only', '--invert'),function(err, res) {if (err) {@@ -492,10 +492,7 @@ describe('options', function() {});it('succeeds if there are only passed tests', function(done) {- runMochaJSON('options/forbid-pending/passed.js', args, function(- err,- res- ) {+ runMochaJSON('options/forbid-pending/passed', args, function(err, res) {if (err) {done(err);return;@@ -507,7 +504,7 @@ describe('options', function() {it('fails if there are tests in suites marked skip', function(done) {runMocha(- 'options/forbid-pending/skip-suite.js',+ 'options/forbid-pending/skip-suite',args,function(err, res) {if (err) {@@ -526,7 +523,7 @@ describe('options', function() {it('fails if there is empty suite marked pending', function(done) {runMocha(- 'options/forbid-pending/skip-empty-suite.js',+ 'options/forbid-pending/skip-empty-suite',args,function(err, res) {if (err) {@@ -544,11 +541,11 @@ describe('options', function() {});var forbidPendingFailureTests = {- 'fails if there are tests marked skip': 'skip.js',- 'fails if there are pending tests': 'pending.js',- 'fails if tests call `skip()`': 'this.skip.js',- 'fails if beforeEach calls `skip()`': 'beforeEach-this.skip.js',- 'fails if before calls `skip()`': 'before-this.skip.js'+ 'fails if there are tests marked skip': 'skip',+ 'fails if there are pending tests': 'pending',+ 'fails if tests call `skip()`': 'this-skip',+ 'fails if beforeEach calls `skip()`': 'beforeEach-this-skip',+ 'fails if before calls `skip()`': 'before-this-skip'};Object.keys(forbidPendingFailureTests).forEach(function(title) {