☕️ Classic, reliable, trusted test framework for Node.js and the browser
fix test files not using .spec suffix fix test fixtures not using .fixture suffix
Christian526dd84b4de9
diff --git a/Makefile b/Makefileindex 4cd96922..b05ce657 100644--- a/Makefile+++ b/Makefile@@ -81,31 +81,31 @@ test-requires:--require test/acceptance/require/b.coffee \--require test/acceptance/require/c.js \--require test/acceptance/require/d.coffee \- test/acceptance/require/require.js+ test/acceptance/require/require.spec.jstest-bdd:@printf "==> [Test :: BDD]\n"$(MOCHA) --reporter $(REPORTER) \--ui bdd \- test/acceptance/interfaces/bdd+ test/acceptance/interfaces/bdd.spectest-tdd:@printf "==> [Test :: TDD]\n"$(MOCHA) --reporter $(REPORTER) \--ui tdd \- test/acceptance/interfaces/tdd+ test/acceptance/interfaces/tdd.spectest-qunit:@printf "==> [Test :: QUnit]\n"$(MOCHA) --reporter $(REPORTER) \--ui qunit \- test/acceptance/interfaces/qunit+ test/acceptance/interfaces/qunit.spectest-exports:@printf "==> [Test :: Exports]\n"$(MOCHA) --reporter $(REPORTER) \--ui exports \- test/acceptance/interfaces/exports+ test/acceptance/interfaces/exports.spectest-glob:@printf "==> [Test :: Glob]\n"@@ -120,29 +120,29 @@ test-only:@printf "==> [Test :: Only]\n"$(MOCHA) --reporter $(REPORTER) \--ui tdd \- test/acceptance/misc/only/tdd+ test/acceptance/misc/only/tdd.spec$(MOCHA) --reporter $(REPORTER) \--ui bdd \- test/acceptance/misc/only/bdd+ test/acceptance/misc/only/bdd.spec$(MOCHA) --reporter $(REPORTER) \--ui qunit \- test/acceptance/misc/only/bdd-require+ test/acceptance/misc/only/bdd-require.spectest-global-only:@printf "==> [Test :: Global Only]\n"$(MOCHA) --reporter $(REPORTER) \--ui tdd \- test/acceptance/misc/only/global/tdd+ test/acceptance/misc/only/global/tdd.spec$(MOCHA) --reporter $(REPORTER) \--ui bdd \- test/acceptance/misc/only/global/bdd+ test/acceptance/misc/only/global/bdd.spec$(MOCHA) --reporter $(REPORTER) \--ui qunit \- test/acceptance/misc/only/global/qunit+ test/acceptance/misc/only/global/qunit.spectest-mocha:@printf "==> [Test :: Mocha]\n"@@ -152,19 +152,19 @@ test-mocha:non-tty:@printf "==> [Test :: Non-TTY]\n"$(MOCHA) --reporter dot \- test/acceptance/interfaces/bdd 2>&1 > /tmp/dot.out+ test/acceptance/interfaces/bdd.spec 2>&1 > /tmp/dot.out@echo dot:@cat /tmp/dot.out$(MOCHA) --reporter list \- test/acceptance/interfaces/bdd 2>&1 > /tmp/list.out+ test/acceptance/interfaces/bdd.spec 2>&1 > /tmp/list.out@echo list:@cat /tmp/list.out$(MOCHA) --reporter spec \- test/acceptance/interfaces/bdd 2>&1 > /tmp/spec.out+ test/acceptance/interfaces/bdd.spec 2>&1 > /tmp/spec.out@echo spec:@cat /tmp/spec.outdiff --git a/karma.conf.js b/karma.conf.jsindex 76e8ae63..125aaf4f 100644--- a/karma.conf.js+++ b/karma.conf.js@@ -18,9 +18,9 @@ module.exports = function(config) {'test/acceptance/*.js'],exclude: [- 'test/acceptance/http.js',- 'test/acceptance/fs.js',- 'test/acceptance/lookup-files.js',+ 'test/acceptance/http.spec.js',+ 'test/acceptance/fs.spec.js',+ 'test/acceptance/lookup-files.spec.js','test/acceptance/require/**/*.js','test/acceptance/misc/**/*.js'],@@ -109,7 +109,7 @@ module.exports = function(config) {}cfg.files = ['test/browser-fixtures/' + ui + '.js',- 'test/acceptance/interfaces/' + ui + '.js'+ 'test/acceptance/interfaces/' + ui + '.spec.js'];} else if (cfg.sauceLabs) {cfg.sauceLabs.testName = 'Unit Tests';diff --git a/scripts/travis-before-install.sh b/scripts/travis-before-install.shindex c725d389..9913070a 100755--- a/scripts/travis-before-install.sh+++ b/scripts/travis-before-install.sh@@ -2,4 +2,4 @@npm install --production# this avoids our mocha.opts (and thus devDependencies) in a roundabout way-./bin/mocha --opts /dev/null --reporter spec test/sanity/sanity.js+./bin/mocha --opts /dev/null --reporter spec test/sanity/sanity.spec.jsdiff --git a/test/acceptance/context.js b/test/acceptance/context.spec.jssimilarity index 100%rename from test/acceptance/context.jsrename to test/acceptance/context.spec.jsdiff --git a/test/acceptance/duration.js b/test/acceptance/duration.spec.jssimilarity index 100%rename from test/acceptance/duration.jsrename to test/acceptance/duration.spec.jsdiff --git a/test/acceptance/fs.js b/test/acceptance/fs.spec.jssimilarity index 100%rename from test/acceptance/fs.jsrename to test/acceptance/fs.spec.jsdiff --git a/test/acceptance/glob/glob.js b/test/acceptance/glob/glob.spec.jssimilarity index 100%rename from test/acceptance/glob/glob.jsrename to test/acceptance/glob/glob.spec.jsdiff --git a/test/acceptance/globals.js b/test/acceptance/globals.spec.jssimilarity index 100%rename from test/acceptance/globals.jsrename to test/acceptance/globals.spec.jsdiff --git a/test/acceptance/http.js b/test/acceptance/http.spec.jssimilarity index 100%rename from test/acceptance/http.jsrename to test/acceptance/http.spec.jsdiff --git a/test/acceptance/interfaces/bdd.js b/test/acceptance/interfaces/bdd.spec.jssimilarity index 100%rename from test/acceptance/interfaces/bdd.jsrename to test/acceptance/interfaces/bdd.spec.jsdiff --git a/test/acceptance/interfaces/exports.js b/test/acceptance/interfaces/exports.spec.jssimilarity index 100%rename from test/acceptance/interfaces/exports.jsrename to test/acceptance/interfaces/exports.spec.jsdiff --git a/test/acceptance/interfaces/qunit.js b/test/acceptance/interfaces/qunit.spec.jssimilarity index 100%rename from test/acceptance/interfaces/qunit.jsrename to test/acceptance/interfaces/qunit.spec.jsdiff --git a/test/acceptance/interfaces/tdd.js b/test/acceptance/interfaces/tdd.spec.jssimilarity index 100%rename from test/acceptance/interfaces/tdd.jsrename to test/acceptance/interfaces/tdd.spec.jsdiff --git a/test/acceptance/lookup-files.js b/test/acceptance/lookup-files.spec.jssimilarity index 100%rename from test/acceptance/lookup-files.jsrename to test/acceptance/lookup-files.spec.jsdiff --git a/test/acceptance/misc/exit.js b/test/acceptance/misc/exit.spec.jssimilarity index 100%rename from test/acceptance/misc/exit.jsrename to test/acceptance/misc/exit.spec.jsdiff --git a/test/acceptance/misc/many.js b/test/acceptance/misc/many.spec.jssimilarity index 100%rename from test/acceptance/misc/many.jsrename to test/acceptance/misc/many.spec.jsdiff --git a/test/acceptance/misc/nontty.js b/test/acceptance/misc/nontty.spec.jssimilarity index 100%rename from test/acceptance/misc/nontty.jsrename to test/acceptance/misc/nontty.spec.jsdiff --git a/test/acceptance/misc/only/bdd-require.js b/test/acceptance/misc/only/bdd-require.spec.jssimilarity index 100%rename from test/acceptance/misc/only/bdd-require.jsrename to test/acceptance/misc/only/bdd-require.spec.jsdiff --git a/test/acceptance/misc/only/bdd.js b/test/acceptance/misc/only/bdd.spec.jssimilarity index 100%rename from test/acceptance/misc/only/bdd.jsrename to test/acceptance/misc/only/bdd.spec.jsdiff --git a/test/acceptance/misc/only/global/bdd.js b/test/acceptance/misc/only/global/bdd.spec.jssimilarity index 100%rename from test/acceptance/misc/only/global/bdd.jsrename to test/acceptance/misc/only/global/bdd.spec.jsdiff --git a/test/acceptance/misc/only/global/qunit.js b/test/acceptance/misc/only/global/qunit.spec.jssimilarity index 100%rename from test/acceptance/misc/only/global/qunit.jsrename to test/acceptance/misc/only/global/qunit.spec.jsdiff --git a/test/acceptance/misc/only/global/tdd.js b/test/acceptance/misc/only/global/tdd.spec.jssimilarity index 100%rename from test/acceptance/misc/only/global/tdd.jsrename to test/acceptance/misc/only/global/tdd.spec.jsdiff --git a/test/acceptance/misc/only/qunit.js b/test/acceptance/misc/only/qunit.spec.jssimilarity index 100%rename from test/acceptance/misc/only/qunit.jsrename to test/acceptance/misc/only/qunit.spec.jsdiff --git a/test/acceptance/misc/only/tdd.js b/test/acceptance/misc/only/tdd.spec.jssimilarity index 100%rename from test/acceptance/misc/only/tdd.jsrename to test/acceptance/misc/only/tdd.spec.jsdiff --git a/test/acceptance/overspecified-async.js b/test/acceptance/overspecified-async.spec.jssimilarity index 100%rename from test/acceptance/overspecified-async.jsrename to test/acceptance/overspecified-async.spec.jsdiff --git a/test/acceptance/require/require.js b/test/acceptance/require/require.spec.jssimilarity index 100%rename from test/acceptance/require/require.jsrename to test/acceptance/require/require.spec.jsdiff --git a/test/acceptance/required-tokens.js b/test/acceptance/required-tokens.spec.jssimilarity index 100%rename from test/acceptance/required-tokens.jsrename to test/acceptance/required-tokens.spec.jsdiff --git a/test/acceptance/root.js b/test/acceptance/root.spec.jssimilarity index 100%rename from test/acceptance/root.jsrename to test/acceptance/root.spec.jsdiff --git a/test/acceptance/throw.js b/test/acceptance/throw.spec.jssimilarity index 100%rename from test/acceptance/throw.jsrename to test/acceptance/throw.spec.jsdiff --git a/test/acceptance/timeout.js b/test/acceptance/timeout.spec.jssimilarity index 100%rename from test/acceptance/timeout.jsrename to test/acceptance/timeout.spec.jsdiff --git a/test/acceptance/utils.js b/test/acceptance/utils.spec.jssimilarity index 100%rename from test/acceptance/utils.jsrename to test/acceptance/utils.spec.jsdiff --git a/test/browser/array.js b/test/browser/array.spec.jssimilarity index 100%rename from test/browser/array.jsrename to test/browser/array.spec.jsdiff --git a/test/browser/grep.js b/test/browser/grep.spec.jssimilarity index 100%rename from test/browser/grep.jsrename to test/browser/grep.spec.jsdiff --git a/test/browser/large.js b/test/browser/large.spec.jssimilarity index 100%rename from test/browser/large.jsrename to test/browser/large.spec.jsdiff --git a/test/browser/multiple-done.js b/test/browser/multiple-done.spec.jssimilarity index 100%rename from test/browser/multiple-done.jsrename to test/browser/multiple-done.spec.jsdiff --git a/test/browser/opts.js b/test/browser/opts.spec.jssimilarity index 100%rename from test/browser/opts.jsrename to test/browser/opts.spec.jsdiff --git a/test/browser/stack-trace.js b/test/browser/stack-trace.spec.jssimilarity index 100%rename from test/browser/stack-trace.jsrename to test/browser/stack-trace.spec.jsdiff --git a/test/browser/ui.js b/test/browser/ui.spec.jssimilarity index 100%rename from test/browser/ui.jsrename to test/browser/ui.spec.jsdiff --git a/test/color.js b/test/color.spec.jssimilarity index 100%rename from test/color.jsrename to test/color.spec.jsdiff --git a/test/grep.js b/test/grep.spec.jssimilarity index 100%rename from test/grep.jsrename to test/grep.spec.jsdiff --git a/test/hook.async.js b/test/hook-async.spec.jssimilarity index 100%rename from test/hook.async.jsrename to test/hook-async.spec.jsdiff --git a/test/hook.sync.nested.js b/test/hook-sync-nested.spec.jssimilarity index 100%rename from test/hook.sync.nested.jsrename to test/hook-sync-nested.spec.jsdiff --git a/test/hook.sync.js b/test/hook-sync.spec.jssimilarity index 100%rename from test/hook.sync.jsrename to test/hook-sync.spec.jsdiff --git a/test/hook.timeout.js b/test/hook-timeout.spec.jssimilarity index 100%rename from test/hook.timeout.jsrename to test/hook-timeout.spec.jsdiff --git a/test/http.meta.2.js b/test/http-meta-2.spec.jssimilarity index 100%rename from test/http.meta.2.jsrename to test/http-meta-2.spec.jsdiff --git a/test/http.meta.js b/test/http-meta.spec.jssimilarity index 100%rename from test/http.meta.jsrename to test/http-meta.spec.jsdiff --git a/test/integration/diffs.js b/test/integration/diffs.spec.jssimilarity index 95%rename from test/integration/diffs.jsrename to test/integration/diffs.spec.jsindex 111b6f20..b779b84a 100644--- a/test/integration/diffs.js+++ b/test/integration/diffs.spec.js@@ -17,7 +17,7 @@ describe('diffs', function() {var diffs, expected;before(function(done) {- run('diffs/diffs.js', ['-C'], function(err, res) {+ run('diffs/diffs.fixture.js', ['-C'], function(err, res) {expected = getExpectedOutput();diffs = getDiffs(res.output);done(err);diff --git a/test/integration/fixtures/cascade.js b/test/integration/fixtures/cascade.fixture.jssimilarity index 100%rename from test/integration/fixtures/cascade.jsrename to test/integration/fixtures/cascade.fixture.jsdiff --git a/test/integration/fixtures/diffs/diffs.js b/test/integration/fixtures/diffs/diffs.fixture.jssimilarity index 100%rename from test/integration/fixtures/diffs/diffs.jsrename to test/integration/fixtures/diffs/diffs.fixture.jsdiff --git a/test/integration/fixtures/hooks/after.hook.async.error.js b/test/integration/fixtures/hooks/after-hook-async-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/after.hook.async.error.jsrename to test/integration/fixtures/hooks/after-hook-async-error.fixture.jsdiff --git a/test/integration/fixtures/hooks/after.hook.error.js b/test/integration/fixtures/hooks/after-hook-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/after.hook.error.jsrename to test/integration/fixtures/hooks/after-hook-error.fixture.jsdiff --git a/test/integration/fixtures/hooks/afterEach.hook.async.error.js b/test/integration/fixtures/hooks/afterEach-hook-async-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/afterEach.hook.async.error.jsrename to test/integration/fixtures/hooks/afterEach-hook-async-error.fixture.jsdiff --git a/test/integration/fixtures/hooks/afterEach.hook.error.js b/test/integration/fixtures/hooks/afterEach-hook-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/afterEach.hook.error.jsrename to test/integration/fixtures/hooks/afterEach-hook-error.fixture.jsdiff --git a/test/integration/fixtures/hooks/before.hook.async.error.tip.js b/test/integration/fixtures/hooks/before-hook-async-error-tip.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/before.hook.async.error.tip.jsrename to test/integration/fixtures/hooks/before-hook-async-error-tip.fixture.jsdiff --git a/test/integration/fixtures/hooks/before.hook.async.error.js b/test/integration/fixtures/hooks/before-hook-async-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/before.hook.async.error.jsrename to test/integration/fixtures/hooks/before-hook-async-error.fixture.jsdiff --git a/test/integration/fixtures/hooks/before.hook.error.tip.js b/test/integration/fixtures/hooks/before-hook-error-tip.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/before.hook.error.tip.jsrename to test/integration/fixtures/hooks/before-hook-error-tip.fixture.jsdiff --git a/test/integration/fixtures/hooks/before.hook.error.js b/test/integration/fixtures/hooks/before-hook-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/before.hook.error.jsrename to test/integration/fixtures/hooks/before-hook-error.fixture.jsdiff --git a/test/integration/fixtures/hooks/beforeEach.hook.async.error.js b/test/integration/fixtures/hooks/beforeEach-hook-async-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/beforeEach.hook.async.error.jsrename to test/integration/fixtures/hooks/beforeEach-hook-async-error.fixture.jsdiff --git a/test/integration/fixtures/hooks/beforeEach.hook.error.js b/test/integration/fixtures/hooks/beforeEach-hook-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/beforeEach.hook.error.jsrename to test/integration/fixtures/hooks/beforeEach-hook-error.fixture.jsdiff --git a/test/integration/fixtures/hooks/multiple.hook.async.error.js b/test/integration/fixtures/hooks/multiple-hook-async-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/multiple.hook.async.error.jsrename to test/integration/fixtures/hooks/multiple-hook-async-error.fixture.jsdiff --git a/test/integration/fixtures/hooks/multiple.hook.error.js b/test/integration/fixtures/hooks/multiple-hook-error.fixture.jssimilarity index 100%rename from test/integration/fixtures/hooks/multiple.hook.error.jsrename to test/integration/fixtures/hooks/multiple-hook-error.fixture.jsdiff --git a/test/integration/fixtures/multiple.done.before.js b/test/integration/fixtures/multiple-done-before.fixture.jssimilarity index 100%rename from test/integration/fixtures/multiple.done.before.jsrename to test/integration/fixtures/multiple-done-before.fixture.jsdiff --git a/test/integration/fixtures/multiple.done.beforeEach.js b/test/integration/fixtures/multiple-done-beforeEach.fixture.jssimilarity index 100%rename from test/integration/fixtures/multiple.done.beforeEach.jsrename to test/integration/fixtures/multiple-done-beforeEach.fixture.jsdiff --git a/test/integration/fixtures/multiple.done.specs.js b/test/integration/fixtures/multiple-done-specs.fixture.jssimilarity index 100%rename from test/integration/fixtures/multiple.done.specs.jsrename to test/integration/fixtures/multiple-done-specs.fixture.jsdiff --git a/test/integration/fixtures/multiple.done.js b/test/integration/fixtures/multiple-done.fixture.jssimilarity index 100%rename from test/integration/fixtures/multiple.done.jsrename to test/integration/fixtures/multiple-done.fixture.jsdiff --git a/test/integration/fixtures/options/async-only.async.js b/test/integration/fixtures/options/async-only-async.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/async-only.async.jsrename to test/integration/fixtures/options/async-only-async.fixture.jsdiff --git a/test/integration/fixtures/options/async-only.sync.js b/test/integration/fixtures/options/async-only-sync.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/async-only.sync.jsrename to test/integration/fixtures/options/async-only-sync.fixture.jsdiff --git a/test/integration/fixtures/options/bail.js b/test/integration/fixtures/options/bail.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/bail.jsrename to test/integration/fixtures/options/bail.fixture.jsdiff --git a/test/integration/fixtures/options/delay-fail.js b/test/integration/fixtures/options/delay-fail.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/delay-fail.jsrename to test/integration/fixtures/options/delay-fail.fixture.jsdiff --git a/test/integration/fixtures/options/delay.js b/test/integration/fixtures/options/delay.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/delay.jsrename to test/integration/fixtures/options/delay.fixture.jsdiff --git a/test/integration/fixtures/options/grep.js b/test/integration/fixtures/options/grep.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/grep.jsrename to test/integration/fixtures/options/grep.fixture.jsdiff --git a/test/integration/fixtures/options/only/bdd.js b/test/integration/fixtures/options/only/bdd.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/only/bdd.jsrename to test/integration/fixtures/options/only/bdd.fixture.jsdiff --git a/test/integration/fixtures/options/only/qunit.js b/test/integration/fixtures/options/only/qunit.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/only/qunit.jsrename to test/integration/fixtures/options/only/qunit.fixture.jsdiff --git a/test/integration/fixtures/options/only/tdd.js b/test/integration/fixtures/options/only/tdd.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/only/tdd.jsrename to test/integration/fixtures/options/only/tdd.fixture.jsdiff --git a/test/integration/fixtures/options/retries.js b/test/integration/fixtures/options/retries.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/retries.jsrename to test/integration/fixtures/options/retries.fixture.jsdiff --git a/test/integration/fixtures/options/sort.alpha.js b/test/integration/fixtures/options/sort-alpha.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/sort.alpha.jsrename to test/integration/fixtures/options/sort-alpha.fixture.jsdiff --git a/test/integration/fixtures/options/sort.beta.js b/test/integration/fixtures/options/sort-beta.fixture.jssimilarity index 100%rename from test/integration/fixtures/options/sort.beta.jsrename to test/integration/fixtures/options/sort-beta.fixture.jsdiff --git a/test/integration/fixtures/passing.js b/test/integration/fixtures/passing.fixture.jssimilarity index 100%rename from test/integration/fixtures/passing.jsrename to test/integration/fixtures/passing.fixture.jsdiff --git a/test/integration/fixtures/pending/skip.async.before.js b/test/integration/fixtures/pending/skip-async-before.fixture.jssimilarity index 100%rename from test/integration/fixtures/pending/skip.async.before.jsrename to test/integration/fixtures/pending/skip-async-before.fixture.jsdiff --git a/test/integration/fixtures/pending/skip.async.beforeEach.js b/test/integration/fixtures/pending/skip-async-beforeEach.fixture.jssimilarity index 100%rename from test/integration/fixtures/pending/skip.async.beforeEach.jsrename to test/integration/fixtures/pending/skip-async-beforeEach.fixture.jsdiff --git a/test/integration/fixtures/pending/skip.async.spec.js b/test/integration/fixtures/pending/skip-async-spec.fixture.jssimilarity index 100%rename from test/integration/fixtures/pending/skip.async.spec.jsrename to test/integration/fixtures/pending/skip-async-spec.fixture.jsdiff --git a/test/integration/fixtures/pending/skip.sync.before.js b/test/integration/fixtures/pending/skip-sync-before.fixture.jssimilarity index 100%rename from test/integration/fixtures/pending/skip.sync.before.jsrename to test/integration/fixtures/pending/skip-sync-before.fixture.jsdiff --git a/test/integration/fixtures/pending/skip.sync.beforeEach.js b/test/integration/fixtures/pending/skip-sync-beforeEach.fixture.jssimilarity index 100%rename from test/integration/fixtures/pending/skip.sync.beforeEach.jsrename to test/integration/fixtures/pending/skip-sync-beforeEach.fixture.jsdiff --git a/test/integration/fixtures/pending/skip.sync.spec.js b/test/integration/fixtures/pending/skip-sync-spec.fixture.jssimilarity index 100%rename from test/integration/fixtures/pending/skip.sync.spec.jsrename to test/integration/fixtures/pending/skip-sync-spec.fixture.jsdiff --git a/test/integration/fixtures/pending/spec.js b/test/integration/fixtures/pending/spec.fixture.jssimilarity index 100%rename from test/integration/fixtures/pending/spec.jsrename to test/integration/fixtures/pending/spec.fixture.jsdiff --git a/test/integration/fixtures/regression/1794/issue-1794.js b/test/integration/fixtures/regression/1794/issue-1794.fixture.jssimilarity index 100%rename from test/integration/fixtures/regression/1794/issue-1794.jsrename to test/integration/fixtures/regression/1794/issue-1794.fixture.jsdiff --git a/test/integration/fixtures/regression/issue-1327.js b/test/integration/fixtures/regression/issue-1327.fixture.jssimilarity index 100%rename from test/integration/fixtures/regression/issue-1327.jsrename to test/integration/fixtures/regression/issue-1327.fixture.jsdiff --git a/test/integration/fixtures/regression/issue-1991.js b/test/integration/fixtures/regression/issue-1991.fixture.jssimilarity index 100%rename from test/integration/fixtures/regression/issue-1991.jsrename to test/integration/fixtures/regression/issue-1991.fixture.jsdiff --git a/test/integration/fixtures/regression/issue-2406.js b/test/integration/fixtures/regression/issue-2406.fixture.jssimilarity index 100%rename from test/integration/fixtures/regression/issue-2406.jsrename to test/integration/fixtures/regression/issue-2406.fixture.jsdiff --git a/test/integration/fixtures/regression/issue-2417.js b/test/integration/fixtures/regression/issue-2417.fixture.jssimilarity index 100%rename from test/integration/fixtures/regression/issue-2417.jsrename to test/integration/fixtures/regression/issue-2417.fixture.jsdiff --git a/test/integration/fixtures/retries/async.js b/test/integration/fixtures/retries/async.fixture.jssimilarity index 100%rename from test/integration/fixtures/retries/async.jsrename to test/integration/fixtures/retries/async.fixture.jsdiff --git a/test/integration/fixtures/retries/early-pass.js b/test/integration/fixtures/retries/early-pass.fixture.jssimilarity index 100%rename from test/integration/fixtures/retries/early-pass.jsrename to test/integration/fixtures/retries/early-pass.fixture.jsdiff --git a/test/integration/fixtures/retries/hooks.js b/test/integration/fixtures/retries/hooks.fixture.jssimilarity index 100%rename from test/integration/fixtures/retries/hooks.jsrename to test/integration/fixtures/retries/hooks.fixture.jsdiff --git a/test/integration/fixtures/retries/nested.js b/test/integration/fixtures/retries/nested.fixture.jssimilarity index 100%rename from test/integration/fixtures/retries/nested.jsrename to test/integration/fixtures/retries/nested.fixture.jsdiff --git a/test/integration/fixtures/timeout.js b/test/integration/fixtures/timeout.fixture.jssimilarity index 100%rename from test/integration/fixtures/timeout.jsrename to test/integration/fixtures/timeout.fixture.jsdiff --git a/test/integration/fixtures/uncaught.hook.js b/test/integration/fixtures/uncaught-hook.fixture.jssimilarity index 100%rename from test/integration/fixtures/uncaught.hook.jsrename to test/integration/fixtures/uncaught-hook.fixture.jsdiff --git a/test/integration/fixtures/uncaught.js b/test/integration/fixtures/uncaught.fixture.jssimilarity index 100%rename from test/integration/fixtures/uncaught.jsrename to test/integration/fixtures/uncaught.fixture.jsdiff --git a/test/integration/hook.err.js b/test/integration/hook-err.spec.jssimilarity index 86%rename from test/integration/hook.err.jsrename to test/integration/hook-err.spec.jsindex f3a16c15..be18721f 100644--- a/test/integration/hook.err.js+++ b/test/integration/hook-err.spec.js@@ -7,7 +7,7 @@ describe('hook error handling', function() {var lines;describe('before hook error', function() {- before(run('hooks/before.hook.error.js'));+ before(run('hooks/before-hook-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,@@ -17,7 +17,7 @@ describe('hook error handling', function() {});describe('before hook error tip', function() {- before(run('hooks/before.hook.error.tip.js', onlyErrorTitle));+ before(run('hooks/before-hook-error-tip.fixture.js', onlyErrorTitle));it('should verify results', function() {assert.deepEqual(lines,@@ -27,7 +27,7 @@ describe('hook error handling', function() {});describe('before each hook error', function() {- before(run('hooks/beforeEach.hook.error.js'));+ before(run('hooks/beforeEach-hook-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,@@ -37,7 +37,7 @@ describe('hook error handling', function() {});describe('after hook error', function() {- before(run('hooks/after.hook.error.js'));+ before(run('hooks/after-hook-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,@@ -47,7 +47,7 @@ describe('hook error handling', function() {});describe('after each hook error', function() {- before(run('hooks/afterEach.hook.error.js'));+ before(run('hooks/afterEach-hook-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,@@ -57,7 +57,7 @@ describe('hook error handling', function() {});describe('multiple hook errors', function() {- before(run('hooks/multiple.hook.error.js'));+ before(run('hooks/multiple-hook-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,@@ -95,7 +95,7 @@ describe('hook error handling', function() {});describe('async - before hook error', function() {- before(run('hooks/before.hook.async.error.js'));+ before(run('hooks/before-hook-async-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,@@ -105,7 +105,7 @@ describe('hook error handling', function() {});describe('async - before hook error tip', function() {- before(run('hooks/before.hook.async.error.tip.js', onlyErrorTitle));+ before(run('hooks/before-hook-async-error-tip.fixture.js', onlyErrorTitle));it('should verify results', function() {assert.deepEqual(lines,@@ -115,7 +115,7 @@ describe('hook error handling', function() {});describe('async - before each hook error', function() {- before(run('hooks/beforeEach.hook.async.error.js'));+ before(run('hooks/beforeEach-hook-async-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,@@ -125,7 +125,7 @@ describe('hook error handling', function() {});describe('async - after hook error', function() {- before(run('hooks/after.hook.async.error.js'));+ before(run('hooks/after-hook-async-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,@@ -135,7 +135,7 @@ describe('hook error handling', function() {});describe('async - after each hook error', function() {- before(run('hooks/afterEach.hook.async.error.js'));+ before(run('hooks/afterEach-hook-async-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,@@ -145,7 +145,7 @@ describe('hook error handling', function() {});describe('async - multiple hook errors', function() {- before(run('hooks/multiple.hook.async.error.js'));+ before(run('hooks/multiple-hook-async-error.fixture.js'));it('should verify results', function() {assert.deepEqual(lines,diff --git a/test/integration/hooks.js b/test/integration/hooks.spec.jssimilarity index 94%rename from test/integration/hooks.jsrename to test/integration/hooks.spec.jsindex acd829f7..7633cb56 100644--- a/test/integration/hooks.js+++ b/test/integration/hooks.spec.js@@ -5,7 +5,7 @@ var args = [];describe('hooks', function() {it('are ran in correct order', function(done) {- run('cascade.js', args, function(err, res) {+ run('cascade.fixture.js', args, function(err, res) {var lines, expected;assert(!err);diff --git a/test/integration/multiple.done.js b/test/integration/multiple-done.spec.jssimilarity index 89%rename from test/integration/multiple.done.jsrename to test/integration/multiple-done.spec.jsindex 0159e90e..47e82dbe 100644--- a/test/integration/multiple.done.js+++ b/test/integration/multiple-done.spec.js@@ -6,7 +6,7 @@ describe('multiple calls to done()', function() {var res;describe('from a spec', function() {before(function(done) {- run('multiple.done.js', args, function(err, result) {+ run('multiple-done.fixture.js', args, function(err, result) {res = result;done(err);});@@ -27,7 +27,7 @@ describe('multiple calls to done()', function() {describe('with multiple specs', function() {before(function(done) {- run('multiple.done.specs.js', args, function(err, result) {+ run('multiple-done-specs.fixture.js', args, function(err, result) {res = result;done(err);});@@ -49,7 +49,7 @@ describe('multiple calls to done()', function() {describe('from a before hook', function() {before(function(done) {- run('multiple.done.before.js', args, function(err, result) {+ run('multiple-done-before.fixture.js', args, function(err, result) {res = result;done(err);});@@ -71,7 +71,7 @@ describe('multiple calls to done()', function() {describe('from a beforeEach hook', function() {before(function(done) {- run('multiple.done.beforeEach.js', args, function(err, result) {+ run('multiple-done-beforeEach.fixture.js', args, function(err, result) {res = result;done(err);});diff --git a/test/integration/only.js b/test/integration/only.spec.jssimilarity index 80%rename from test/integration/only.jsrename to test/integration/only.spec.jsindex dc7644e5..592ea17e 100644--- a/test/integration/only.js+++ b/test/integration/only.spec.js@@ -3,7 +3,7 @@ var assert = require('assert');describe('.only()', function() {it('should run only tests that marked as `only`', function(done) {- run('options/only/bdd.js', ['--ui', 'bdd'], function(err, res) {+ run('options/only/bdd.fixture.js', ['--ui', 'bdd'], function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 11);@@ -14,7 +14,7 @@ describe('.only()', function() {});it('should run only tests that marked as `only`', function(done) {- run('options/only/tdd.js', ['--ui', 'tdd'], function(err, res) {+ run('options/only/tdd.fixture.js', ['--ui', 'tdd'], function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 8);@@ -25,7 +25,7 @@ describe('.only()', function() {});it('should run only tests that marked as `only`', function(done) {- run('options/only/qunit.js', ['--ui', 'qunit'], function(err, res) {+ run('options/only/qunit.fixture.js', ['--ui', 'qunit'], function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 5);diff --git a/test/integration/options.js b/test/integration/options.spec.jssimilarity index 87%rename from test/integration/options.jsrename to test/integration/options.spec.jsindex 5371b7a7..4755647f 100644--- a/test/integration/options.js+++ b/test/integration/options.spec.js@@ -10,7 +10,7 @@ describe('options', function() {});it('should fail synchronous specs', function(done) {- run('options/async-only.sync.js', args, function(err, res) {+ run('options/async-only-sync.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 0);@@ -23,7 +23,7 @@ describe('options', function() {});it('should allow asynchronous specs', function(done) {- run('options/async-only.async.js', args, function(err, res) {+ run('options/async-only-async.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 1);@@ -42,7 +42,7 @@ describe('options', function() {});it('should stop after the first error', function(done) {- run('options/bail.js', args, function(err, res) {+ run('options/bail.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 1);@@ -82,7 +82,7 @@ describe('options', function() {});it('should run the generated test suite', function(done) {- run('options/delay.js', args, function(err, res) {+ run('options/delay.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 1);@@ -96,7 +96,7 @@ describe('options', function() {});it('should throw an error if the test suite failed to run', function(done) {- run('options/delay-fail.js', args, function(err, res) {+ run('options/delay-fail.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 0);@@ -113,7 +113,7 @@ describe('options', function() {describe('--grep', function() {it('runs specs matching a string', function(done) {args = ['--grep', 'match'];- run('options/grep.js', args, function(err, res) {+ run('options/grep.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 2);@@ -126,7 +126,7 @@ describe('options', function() {describe('runs specs matching a RegExp', function() {it('with RegExp like strings(pattern follow by flag)', function(done) {args = ['--grep', '/match/i'];- run('options/grep.js', args, function(err, res) {+ run('options/grep.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 4);@@ -138,7 +138,7 @@ describe('options', function() {it('string as pattern', function(done) {args = ['--grep', '.*'];- run('options/grep.js', args, function(err, res) {+ run('options/grep.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 4);@@ -152,7 +152,7 @@ describe('options', function() {describe('with --invert', function() {it('runs specs that do not match the pattern', function(done) {args = ['--grep', 'fail', '--invert'];- run('options/grep.js', args, function(err, res) {+ run('options/grep.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 4);@@ -167,7 +167,7 @@ describe('options', function() {describe('--retries', function() {it('retries after a certain threshold', function (done) {args = ['--retries', '3'];- run('options/retries.js', args, function(err, res) {+ run('options/retries.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 0);diff --git a/test/integration/pending.js b/test/integration/pending.spec.jssimilarity index 83%rename from test/integration/pending.jsrename to test/integration/pending.spec.jsindex 0c18ab4b..4d4beffc 100644--- a/test/integration/pending.js+++ b/test/integration/pending.spec.js@@ -5,7 +5,7 @@ var args = [];describe('pending', function() {describe('pending specs', function() {it('should be created by omitting a function', function(done) {- run('pending/spec.js', args, function(err, res) {+ run('pending/spec.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 1);assert.equal(res.stats.passes, 0);@@ -19,7 +19,7 @@ describe('pending', function() {describe('synchronous skip()', function() {describe('in spec', function() {it('should immediately skip the spec and run all others', function(done) {- run('pending/skip.sync.spec.js', args, function(err, res) {+ run('pending/skip-sync-spec.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 1);assert.equal(res.stats.passes, 1);@@ -32,7 +32,7 @@ describe('pending', function() {describe('in before', function() {it('should skip all suite specs', function(done) {- run('pending/skip.sync.before.js', args, function(err, res) {+ run('pending/skip-sync-before.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 2);assert.equal(res.stats.passes, 0);@@ -45,7 +45,7 @@ describe('pending', function() {describe('in beforeEach', function() {it('should skip all suite specs', function(done) {- run('pending/skip.sync.beforeEach.js', args, function(err, res) {+ run('pending/skip-sync-beforeEach.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 2);assert.equal(res.stats.passes, 0);@@ -60,7 +60,7 @@ describe('pending', function() {describe('asynchronous skip()', function() {describe('in spec', function() {it('should immediately skip the spec and run all others', function(done) {- run('pending/skip.async.spec.js', args, function(err, res) {+ run('pending/skip-async-spec.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 1);assert.equal(res.stats.passes, 1);@@ -73,7 +73,7 @@ describe('pending', function() {describe('in before', function() {it('should skip all suite specs', function(done) {- run('pending/skip.async.before.js', args, function(err, res) {+ run('pending/skip-async-before.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 2);assert.equal(res.stats.passes, 0);@@ -86,7 +86,7 @@ describe('pending', function() {describe('in beforeEach', function() {it('should skip all suite specs', function(done) {- run('pending/skip.sync.beforeEach.js', args, function(err, res) {+ run('pending/skip-sync-beforeEach.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 2);assert.equal(res.stats.passes, 0);diff --git a/test/integration/regression.js b/test/integration/regression.spec.jssimilarity index 89%rename from test/integration/regression.jsrename to test/integration/regression.spec.jsindex f0762ec0..f9f96d31 100644--- a/test/integration/regression.js+++ b/test/integration/regression.spec.js@@ -7,7 +7,7 @@ var runJSON = require('./helpers').runMochaJSON;describe('regressions', function() {it('issue-1327: should run all 3 specs exactly once', function(done) {var args = [];- run('regression/issue-1327.js', args, function(err, res) {+ run('regression/issue-1327.fixture.js', args, function(err, res) {var occurences = function(str) {var pattern = new RegExp(str, 'g');return (res.output.match(pattern) || []).length;@@ -33,7 +33,7 @@ describe('regressions', function() {it('issue-1794: Can\'t --require custom UI and use it', function(done) {var simpleUiPath = path.join(__dirname, 'fixtures', 'regression', '1794', 'simple-ui.js');var args = ['--require', simpleUiPath, '--ui', 'simple-ui'];- run('regression/1794/issue-1794.js', args, function(err, res) {+ run('regression/1794/issue-1794.fixture.js', args, function(err, res) {assert.equal(res.code, 0, 'Custom UI should be loaded');done();});@@ -43,7 +43,7 @@ describe('regressions', function() {// on a modern MBP takes ±5 seconds on node 4.0, but on older laptops with node 0.12 ±40 seconds.// Could easily take longer on even weaker machines (Travis-CI containers for example).this.timeout(120000);- run('regression/issue-1991.js', [], function(err, res) {+ run('regression/issue-1991.fixture.js', [], function(err, res) {assert.equal(/process out of memory/.test(res.output), false, 'fixture\'s process out of memory!');assert.equal(res.code, 0, 'Runnable fn (it/before[Each]/after[Each]) references should be deleted to avoid memory leaks');done();@@ -64,7 +64,7 @@ describe('regressions', function() {it('issue-2406: should run nested describe.only suites', function(done) {this.timeout(2000);- runJSON('regression/issue-2406.js', [], function(err, res) {+ runJSON('regression/issue-2406.fixture.js', [], function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 2);@@ -75,7 +75,7 @@ describe('regressions', function() {});it('issue-2417: should not recurse infinitely with .only suites nested within each other', function() {- runJSON('regression/issue-2417.js', [], function(err, res) {+ runJSON('regression/issue-2417.fixture.js', [], function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 1);diff --git a/test/integration/reporters.js b/test/integration/reporters.spec.jssimilarity index 91%rename from test/integration/reporters.jsrename to test/integration/reporters.spec.jsindex c2f022fe..95956118 100644--- a/test/integration/reporters.js+++ b/test/integration/reporters.spec.js@@ -10,7 +10,7 @@ describe('reporters', function() {var res;before(function(done) {- run('passing.js', ['--reporter', 'markdown'], function(err, result) {+ run('passing.fixture.js', ['--reporter', 'markdown'], function(err, result) {res = result;done(err);});@@ -44,7 +44,7 @@ describe('reporters', function() {'</testsuite>'];- run('passing.js', args, function(err, result) {+ run('passing.fixture.js', args, function(err, result) {if (err) return done(err);var xml = fs.readFileSync(tmpFile, 'utf8');diff --git a/test/integration/retries.js b/test/integration/retries.spec.jssimilarity index 88%rename from test/integration/retries.jsrename to test/integration/retries.spec.jsindex 56516b3a..ce76545b 100644--- a/test/integration/retries.js+++ b/test/integration/retries.spec.js@@ -5,7 +5,7 @@ var bang = require('../../lib/reporters/base').symbols.bang;describe('retries', function() {it('are ran in correct order', function(done) {- helpers.runMocha('retries/hooks.js', args, function(err, res) {+ helpers.runMocha('retries/hooks.fixture.js', args, function(err, res) {var lines, expected;assert(!err);@@ -46,7 +46,7 @@ describe('retries', function() {});it('should exit early if test passes', function (done) {- helpers.runMochaJSON('retries/early-pass.js', args, function(err, res) {+ helpers.runMochaJSON('retries/early-pass.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.passes, 1);assert.equal(res.stats.failures, 0);@@ -58,7 +58,7 @@ describe('retries', function() {});it('should let test override', function (done) {- helpers.runMochaJSON('retries/nested.js', args, function(err, res) {+ helpers.runMochaJSON('retries/nested.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.passes, 0);assert.equal(res.stats.failures, 1);@@ -70,7 +70,7 @@ describe('retries', function() {});it('should not hang w/ async test', function (done) {- helpers.runMocha('retries/async.js', args, function(err, res) {+ helpers.runMocha('retries/async.fixture.js', args, function(err, res) {var lines, expected;assert(!err);diff --git a/test/integration/timeout.js b/test/integration/timeout.spec.jssimilarity index 87%rename from test/integration/timeout.jsrename to test/integration/timeout.spec.jsindex b2dfb201..33b8e330 100644--- a/test/integration/timeout.js+++ b/test/integration/timeout.spec.js@@ -4,7 +4,7 @@ var args = [];describe('this.timeout()', function() {it('is respected by sync and async suites', function(done) {- run('timeout.js', args, function(err, res) {+ run('timeout.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 0);diff --git a/test/integration/uncaught.js b/test/integration/uncaught.spec.jssimilarity index 89%rename from test/integration/uncaught.jsrename to test/integration/uncaught.spec.jsindex 92a0ce5d..87dde909 100644--- a/test/integration/uncaught.js+++ b/test/integration/uncaught.spec.js@@ -4,7 +4,7 @@ var args = [];describe('uncaught exceptions', function() {it('handles uncaught exceptions from hooks', function(done) {- run('uncaught.hook.js', args, function(err, res) {+ run('uncaught-hook.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 0);@@ -18,7 +18,7 @@ describe('uncaught exceptions', function() {});it('handles uncaught exceptions from async specs', function(done) {- run('uncaught.js', args, function(err, res) {+ run('uncaught.fixture.js', args, function(err, res) {assert(!err);assert.equal(res.stats.pending, 0);assert.equal(res.stats.passes, 0);diff --git a/test/jsapi/index.js b/test/jsapi/index.jsindex 2dbbcb04..a096186b 100644--- a/test/jsapi/index.js+++ b/test/jsapi/index.js@@ -11,16 +11,16 @@ var mocha = new Mocha({// mocha.reporter('spec');require('should');-mocha.addFile('test/suite.js');-mocha.addFile('test/runner.js');-mocha.addFile('test/runnable.js');-mocha.addFile('test/hook.sync.js');-mocha.addFile('test/hook.sync.nested.js');-mocha.addFile('test/hook.async.js');-mocha.addFile('test/acceptance/duration.js');-mocha.addFile('test/acceptance/fs.js');-mocha.addFile('test/acceptance/globals.js');-mocha.addFile('test/acceptance/timeout.js');+mocha.addFile('test/suite.spec.js');+mocha.addFile('test/runner.spec.js');+mocha.addFile('test/runnable.spec.js');+mocha.addFile('test/hook-sync.spec.js');+mocha.addFile('test/hook-sync-nested.spec.js');+mocha.addFile('test/hook-async.spec.js');+mocha.addFile('test/acceptance/duration.spec.js');+mocha.addFile('test/acceptance/fs.spec.js');+mocha.addFile('test/acceptance/globals.spec.js');+mocha.addFile('test/acceptance/timeout.spec.js');mocha.run(function(){console.log('done');diff --git a/test/mocha.js b/test/mocha.spec.jssimilarity index 100%rename from test/mocha.jsrename to test/mocha.spec.jsdiff --git a/test/ms.js b/test/ms.spec.jssimilarity index 100%rename from test/ms.jsrename to test/ms.spec.jsdiff --git a/test/reporters/base.js b/test/reporters/base.spec.jssimilarity index 100%rename from test/reporters/base.jsrename to test/reporters/base.spec.jsdiff --git a/test/reporters/json.js b/test/reporters/json.spec.jssimilarity index 100%rename from test/reporters/json.jsrename to test/reporters/json.spec.jsdiff --git a/test/reporters/nyan.js b/test/reporters/nyan.spec.jssimilarity index 100%rename from test/reporters/nyan.jsrename to test/reporters/nyan.spec.jsdiff --git a/test/runnable.js b/test/runnable.spec.jssimilarity index 100%rename from test/runnable.jsrename to test/runnable.spec.jsdiff --git a/test/runner.js b/test/runner.spec.jssimilarity index 100%rename from test/runner.jsrename to test/runner.spec.jsdiff --git a/test/sanity/sanity.js b/test/sanity/sanity.spec.jssimilarity index 100%rename from test/sanity/sanity.jsrename to test/sanity/sanity.spec.jsdiff --git a/test/suite.js b/test/suite.spec.jssimilarity index 100%rename from test/suite.jsrename to test/suite.spec.jsdiff --git a/test/test.js b/test/test.spec.jssimilarity index 100%rename from test/test.jsrename to test/test.spec.jsdiff --git a/test/utils.js b/test/utils.spec.jssimilarity index 100%rename from test/utils.jsrename to test/utils.spec.js