Merge branch 'issue/2383'

* issue/2383: rename more fixtures; closes #2383 fix test files not using .spec suffix fix test fixtures not using .fixture suffix
mochajs · Sep 19, 2016 · 9e7f5f2 · 9e7f5f2
2 parents 1786fe2 + 93e9fc9
commit 9e7f5f2
Show file tree

Hide file tree

Showing 124 changed files with 86 additions and 84 deletions.
diff --git 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.js
 
 test-bdd:
 	@printf "==> [Test :: BDD]\n"
 	$(MOCHA) --reporter $(REPORTER) \
 		--ui bdd \
-		test/acceptance/interfaces/bdd
+		test/acceptance/interfaces/bdd.spec
 
 test-tdd:
 	@printf "==> [Test :: TDD]\n"
 	$(MOCHA) --reporter $(REPORTER) \
 		--ui tdd \
-		test/acceptance/interfaces/tdd
+		test/acceptance/interfaces/tdd.spec
 
 test-qunit:
 	@printf "==> [Test :: QUnit]\n"
 	$(MOCHA) --reporter $(REPORTER) \
 		--ui qunit \
-		test/acceptance/interfaces/qunit
+		test/acceptance/interfaces/qunit.spec
 
 test-exports:
 	@printf "==> [Test :: Exports]\n"
 	$(MOCHA) --reporter $(REPORTER) \
 		--ui exports \
-		test/acceptance/interfaces/exports
+		test/acceptance/interfaces/exports.spec
 
 test-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.spec
 
 test-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.spec
 
 test-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.out

diff --git a/karma.conf.js b/karma.conf.js
@@ -14,13 +14,15 @@ module.exports = function(config) {
       'mocha'
     ],
     files: [
-      'test/browser-fixtures/bdd.js',
-      'test/acceptance/*.js'
+      // we use the BDD interface for all of the tests that
+      // aren't interface-specific.
+      'test/browser-fixtures/bdd.fixture.js',
+      'test/acceptance/*.spec.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'
     ],
@@ -108,8 +110,8 @@ module.exports = function(config) {
       cfg.sauceLabs.testName = 'Interface "' + ui + '" integration tests';
     }
     cfg.files = [
-      'test/browser-fixtures/' + ui + '.js',
-      'test/acceptance/interfaces/' + ui + '.js'
+      'test/browser-fixtures/' + ui + '.fixture.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.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.js
diff --git a/test/acceptance/context.js → test/acceptance/context.spec.js b/test/acceptance/context.js → test/acceptance/context.spec.js
diff --git a/test/acceptance/duration.js → test/acceptance/duration.spec.js b/test/acceptance/duration.js → test/acceptance/duration.spec.js
diff --git a/test/acceptance/fs.js → test/acceptance/fs.spec.js b/test/acceptance/fs.js → test/acceptance/fs.spec.js
diff --git a/test/acceptance/glob/glob.js → test/acceptance/glob/glob.spec.js b/test/acceptance/glob/glob.js → test/acceptance/glob/glob.spec.js
diff --git a/test/acceptance/globals.js → test/acceptance/globals.spec.js b/test/acceptance/globals.js → test/acceptance/globals.spec.js
diff --git a/test/acceptance/http.js → test/acceptance/http.spec.js b/test/acceptance/http.js → test/acceptance/http.spec.js
diff --git a/test/acceptance/interfaces/bdd.js → test/acceptance/interfaces/bdd.spec.js b/test/acceptance/interfaces/bdd.js → test/acceptance/interfaces/bdd.spec.js
diff --git a/test/acceptance/interfaces/exports.js → test/acceptance/interfaces/exports.spec.js b/test/acceptance/interfaces/exports.js → test/acceptance/interfaces/exports.spec.js
diff --git a/test/acceptance/interfaces/qunit.js → test/acceptance/interfaces/qunit.spec.js b/test/acceptance/interfaces/qunit.js → test/acceptance/interfaces/qunit.spec.js
diff --git a/test/acceptance/interfaces/tdd.js → test/acceptance/interfaces/tdd.spec.js b/test/acceptance/interfaces/tdd.js → test/acceptance/interfaces/tdd.spec.js
diff --git a/test/acceptance/lookup-files.js → test/acceptance/lookup-files.spec.js b/test/acceptance/lookup-files.js → test/acceptance/lookup-files.spec.js
diff --git a/test/acceptance/misc/exit.js → test/acceptance/misc/exit.spec.js b/test/acceptance/misc/exit.js → test/acceptance/misc/exit.spec.js
diff --git a/test/acceptance/misc/many.js → test/acceptance/misc/many.spec.js b/test/acceptance/misc/many.js → test/acceptance/misc/many.spec.js
diff --git a/test/acceptance/misc/nontty.js → test/acceptance/misc/nontty.spec.js b/test/acceptance/misc/nontty.js → test/acceptance/misc/nontty.spec.js
diff --git a/test/acceptance/misc/only/bdd-require.js → .../acceptance/misc/only/bdd-require.spec.js b/test/acceptance/misc/only/bdd-require.js → .../acceptance/misc/only/bdd-require.spec.js
diff --git a/test/acceptance/misc/only/bdd.js → test/acceptance/misc/only/bdd.spec.js b/test/acceptance/misc/only/bdd.js → test/acceptance/misc/only/bdd.spec.js
diff --git a/test/acceptance/misc/only/global/bdd.js → test/acceptance/misc/only/global/bdd.spec.js b/test/acceptance/misc/only/global/bdd.js → test/acceptance/misc/only/global/bdd.spec.js
diff --git a/test/acceptance/misc/only/global/qunit.js → ...acceptance/misc/only/global/qunit.spec.js b/test/acceptance/misc/only/global/qunit.js → ...acceptance/misc/only/global/qunit.spec.js
diff --git a/test/acceptance/misc/only/global/tdd.js → test/acceptance/misc/only/global/tdd.spec.js b/test/acceptance/misc/only/global/tdd.js → test/acceptance/misc/only/global/tdd.spec.js
diff --git a/test/acceptance/misc/only/qunit.js → test/acceptance/misc/only/qunit.spec.js b/test/acceptance/misc/only/qunit.js → test/acceptance/misc/only/qunit.spec.js
diff --git a/test/acceptance/misc/only/tdd.js → test/acceptance/misc/only/tdd.spec.js b/test/acceptance/misc/only/tdd.js → test/acceptance/misc/only/tdd.spec.js
diff --git a/test/acceptance/overspecified-async.js → test/acceptance/overspecified-async.spec.js b/test/acceptance/overspecified-async.js → test/acceptance/overspecified-async.spec.js
diff --git a/test/acceptance/require/require.js → test/acceptance/require/require.spec.js b/test/acceptance/require/require.js → test/acceptance/require/require.spec.js
diff --git a/test/acceptance/required-tokens.js → test/acceptance/required-tokens.spec.js b/test/acceptance/required-tokens.js → test/acceptance/required-tokens.spec.js
diff --git a/test/acceptance/root.js → test/acceptance/root.spec.js b/test/acceptance/root.js → test/acceptance/root.spec.js
diff --git a/test/acceptance/throw.js → test/acceptance/throw.spec.js b/test/acceptance/throw.js → test/acceptance/throw.spec.js
diff --git a/test/acceptance/timeout.js → test/acceptance/timeout.spec.js b/test/acceptance/timeout.js → test/acceptance/timeout.spec.js
diff --git a/test/acceptance/utils.js → test/acceptance/utils.spec.js b/test/acceptance/utils.js → test/acceptance/utils.spec.js
diff --git a/test/browser-fixtures/bdd.js → test/browser-fixtures/bdd.fixture.js b/test/browser-fixtures/bdd.js → test/browser-fixtures/bdd.fixture.js
diff --git a/test/browser-fixtures/exports.js → test/browser-fixtures/exports.fixture.js b/test/browser-fixtures/exports.js → test/browser-fixtures/exports.fixture.js
diff --git a/test/browser-fixtures/qunit.js → test/browser-fixtures/qunit.fixture.js b/test/browser-fixtures/qunit.js → test/browser-fixtures/qunit.fixture.js
diff --git a/test/browser-fixtures/tdd.js → test/browser-fixtures/tdd.fixture.js b/test/browser-fixtures/tdd.js → test/browser-fixtures/tdd.fixture.js
diff --git a/test/browser/array.js → test/browser/array.spec.js b/test/browser/array.js → test/browser/array.spec.js
diff --git a/test/browser/grep.js → test/browser/grep.spec.js b/test/browser/grep.js → test/browser/grep.spec.js
diff --git a/test/browser/large.js → test/browser/large.spec.js b/test/browser/large.js → test/browser/large.spec.js
diff --git a/test/browser/multiple-done.js → test/browser/multiple-done.spec.js b/test/browser/multiple-done.js → test/browser/multiple-done.spec.js
diff --git a/test/browser/opts.js → test/browser/opts.spec.js b/test/browser/opts.js → test/browser/opts.spec.js
diff --git a/test/browser/stack-trace.js → test/browser/stack-trace.spec.js b/test/browser/stack-trace.js → test/browser/stack-trace.spec.js
diff --git a/test/browser/ui.js → test/browser/ui.spec.js b/test/browser/ui.js → test/browser/ui.spec.js
diff --git a/test/color.js → test/color.spec.js b/test/color.js → test/color.spec.js
diff --git a/test/grep.js → test/grep.spec.js b/test/grep.js → test/grep.spec.js
diff --git a/test/hook.async.js → test/hook-async.spec.js b/test/hook.async.js → test/hook-async.spec.js
diff --git a/test/hook.sync.nested.js → test/hook-sync-nested.spec.js b/test/hook.sync.nested.js → test/hook-sync-nested.spec.js
diff --git a/test/hook.sync.js → test/hook-sync.spec.js b/test/hook.sync.js → test/hook-sync.spec.js
diff --git a/test/hook.timeout.js → test/hook-timeout.spec.js b/test/hook.timeout.js → test/hook-timeout.spec.js
diff --git a/test/http.meta.2.js → test/http-meta-2.spec.js b/test/http.meta.2.js → test/http-meta-2.spec.js
diff --git a/test/http.meta.js → test/http-meta.spec.js b/test/http.meta.js → test/http-meta.spec.js
diff --git a/test/integration/diffs.js → test/integration/diffs.spec.js b/test/integration/diffs.js → 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 → test/integration/fixtures/cascade.fixture.js b/test/integration/fixtures/cascade.js → test/integration/fixtures/cascade.fixture.js
diff --git a/test/integration/fixtures/diffs/diffs.js → ...tegration/fixtures/diffs/diffs.fixture.js b/test/integration/fixtures/diffs/diffs.js → ...tegration/fixtures/diffs/diffs.fixture.js
diff --git a/.../fixtures/hooks/after.hook.async.error.js → ...s/hooks/after-hook-async-error.fixture.js b/.../fixtures/hooks/after.hook.async.error.js → ...s/hooks/after-hook-async-error.fixture.js
diff --git a/...ration/fixtures/hooks/after.hook.error.js → ...ixtures/hooks/after-hook-error.fixture.js b/...ration/fixtures/hooks/after.hook.error.js → ...ixtures/hooks/after-hook-error.fixture.js
diff --git a/...tures/hooks/afterEach.hook.async.error.js → ...oks/afterEach-hook-async-error.fixture.js b/...tures/hooks/afterEach.hook.async.error.js → ...oks/afterEach-hook-async-error.fixture.js
diff --git a/...on/fixtures/hooks/afterEach.hook.error.js → ...res/hooks/afterEach-hook-error.fixture.js b/...on/fixtures/hooks/afterEach.hook.error.js → ...res/hooks/afterEach-hook-error.fixture.js
diff --git a/...ures/hooks/before.hook.async.error.tip.js → ...ks/before-hook-async-error-tip.fixture.js b/...ures/hooks/before.hook.async.error.tip.js → ...ks/before-hook-async-error-tip.fixture.js
diff --git a/...fixtures/hooks/before.hook.async.error.js → .../hooks/before-hook-async-error.fixture.js b/...fixtures/hooks/before.hook.async.error.js → .../hooks/before-hook-async-error.fixture.js
diff --git a/...n/fixtures/hooks/before.hook.error.tip.js → ...es/hooks/before-hook-error-tip.fixture.js b/...n/fixtures/hooks/before.hook.error.tip.js → ...es/hooks/before-hook-error-tip.fixture.js
diff --git a/...ation/fixtures/hooks/before.hook.error.js → ...xtures/hooks/before-hook-error.fixture.js b/...ation/fixtures/hooks/before.hook.error.js → ...xtures/hooks/before-hook-error.fixture.js
diff --git a/...ures/hooks/beforeEach.hook.async.error.js → ...ks/beforeEach-hook-async-error.fixture.js b/...ures/hooks/beforeEach.hook.async.error.js → ...ks/beforeEach-hook-async-error.fixture.js
diff --git a/...n/fixtures/hooks/beforeEach.hook.error.js → ...es/hooks/beforeEach-hook-error.fixture.js b/...n/fixtures/hooks/beforeEach.hook.error.js → ...es/hooks/beforeEach-hook-error.fixture.js
diff --git a/...xtures/hooks/multiple.hook.async.error.js → ...ooks/multiple-hook-async-error.fixture.js b/...xtures/hooks/multiple.hook.async.error.js → ...ooks/multiple-hook-async-error.fixture.js
diff --git a/...ion/fixtures/hooks/multiple.hook.error.js → ...ures/hooks/multiple-hook-error.fixture.js b/...ion/fixtures/hooks/multiple.hook.error.js → ...ures/hooks/multiple-hook-error.fixture.js
diff --git a/...egration/fixtures/multiple.done.before.js → .../fixtures/multiple-done-before.fixture.js b/...egration/fixtures/multiple.done.before.js → .../fixtures/multiple-done-before.fixture.js
diff --git a/...tion/fixtures/multiple.done.beforeEach.js → ...tures/multiple-done-beforeEach.fixture.js b/...tion/fixtures/multiple.done.beforeEach.js → ...tures/multiple-done-beforeEach.fixture.js
diff --git a/...tegration/fixtures/multiple.done.specs.js → ...n/fixtures/multiple-done-specs.fixture.js b/...tegration/fixtures/multiple.done.specs.js → ...n/fixtures/multiple-done-specs.fixture.js
diff --git a/test/integration/fixtures/multiple.done.js → ...gration/fixtures/multiple-done.fixture.js b/test/integration/fixtures/multiple.done.js → ...gration/fixtures/multiple-done.fixture.js
diff --git a/...tion/fixtures/options/async-only.async.js → ...tures/options/async-only-async.fixture.js b/...tion/fixtures/options/async-only.async.js → ...tures/options/async-only-async.fixture.js
diff --git a/...ation/fixtures/options/async-only.sync.js → ...xtures/options/async-only-sync.fixture.js b/...ation/fixtures/options/async-only.sync.js → ...xtures/options/async-only-sync.fixture.js
diff --git a/test/integration/fixtures/options/bail.js → ...egration/fixtures/options/bail.fixture.js b/test/integration/fixtures/options/bail.js → ...egration/fixtures/options/bail.fixture.js
diff --git a/...ntegration/fixtures/options/delay-fail.js → ...on/fixtures/options/delay-fail.fixture.js b/...ntegration/fixtures/options/delay-fail.js → ...on/fixtures/options/delay-fail.fixture.js
diff --git a/test/integration/fixtures/options/delay.js → ...gration/fixtures/options/delay.fixture.js b/test/integration/fixtures/options/delay.js → ...gration/fixtures/options/delay.fixture.js
diff --git a/test/integration/fixtures/options/grep.js → ...egration/fixtures/options/grep.fixture.js b/test/integration/fixtures/options/grep.js → ...egration/fixtures/options/grep.fixture.js
diff --git a/.../integration/fixtures/options/only/bdd.js → ...tion/fixtures/options/only/bdd.fixture.js b/.../integration/fixtures/options/only/bdd.js → ...tion/fixtures/options/only/bdd.fixture.js
diff --git a/...ntegration/fixtures/options/only/qunit.js → ...on/fixtures/options/only/qunit.fixture.js b/...ntegration/fixtures/options/only/qunit.js → ...on/fixtures/options/only/qunit.fixture.js
diff --git a/.../integration/fixtures/options/only/tdd.js → ...tion/fixtures/options/only/tdd.fixture.js b/.../integration/fixtures/options/only/tdd.js → ...tion/fixtures/options/only/tdd.fixture.js
diff --git a/test/integration/fixtures/options/retries.js → ...ation/fixtures/options/retries.fixture.js b/test/integration/fixtures/options/retries.js → ...ation/fixtures/options/retries.fixture.js
diff --git a/...ntegration/fixtures/options/sort.alpha.js → ...on/fixtures/options/sort-alpha.fixture.js b/...ntegration/fixtures/options/sort.alpha.js → ...on/fixtures/options/sort-alpha.fixture.js
diff --git a/...integration/fixtures/options/sort.beta.js → ...ion/fixtures/options/sort-beta.fixture.js b/...integration/fixtures/options/sort.beta.js → ...ion/fixtures/options/sort-beta.fixture.js
diff --git a/test/integration/fixtures/passing.js → test/integration/fixtures/passing.fixture.js b/test/integration/fixtures/passing.js → test/integration/fixtures/passing.fixture.js
diff --git a/...ion/fixtures/pending/skip.async.before.js → ...ures/pending/skip-async-before.fixture.js b/...ion/fixtures/pending/skip.async.before.js → ...ures/pending/skip-async-before.fixture.js
diff --git a/...fixtures/pending/skip.async.beforeEach.js → .../pending/skip-async-beforeEach.fixture.js b/...fixtures/pending/skip.async.beforeEach.js → .../pending/skip-async-beforeEach.fixture.js
diff --git a/...ation/fixtures/pending/skip.async.spec.js → ...xtures/pending/skip-async-spec.fixture.js b/...ation/fixtures/pending/skip.async.spec.js → ...xtures/pending/skip-async-spec.fixture.js
diff --git a/...tion/fixtures/pending/skip.sync.before.js → ...tures/pending/skip-sync-before.fixture.js b/...tion/fixtures/pending/skip.sync.before.js → ...tures/pending/skip-sync-before.fixture.js
diff --git a/.../fixtures/pending/skip.sync.beforeEach.js → ...s/pending/skip-sync-beforeEach.fixture.js b/.../fixtures/pending/skip.sync.beforeEach.js → ...s/pending/skip-sync-beforeEach.fixture.js
diff --git a/...ration/fixtures/pending/skip.sync.spec.js → ...ixtures/pending/skip-sync-spec.fixture.js b/...ration/fixtures/pending/skip.sync.spec.js → ...ixtures/pending/skip-sync-spec.fixture.js
diff --git a/test/integration/fixtures/pending/spec.js → ...egration/fixtures/pending/spec.fixture.js b/test/integration/fixtures/pending/spec.js → ...egration/fixtures/pending/spec.fixture.js
diff --git a/...on/fixtures/regression/1794/issue-1794.js → ...res/regression/1794/issue-1794.fixture.js b/...on/fixtures/regression/1794/issue-1794.js → ...res/regression/1794/issue-1794.fixture.js
diff --git a/...gration/fixtures/regression/issue-1327.js → ...fixtures/regression/issue-1327.fixture.js b/...gration/fixtures/regression/issue-1327.js → ...fixtures/regression/issue-1327.fixture.js
diff --git a/...gration/fixtures/regression/issue-1991.js → ...fixtures/regression/issue-1991.fixture.js b/...gration/fixtures/regression/issue-1991.js → ...fixtures/regression/issue-1991.fixture.js
diff --git a/...gration/fixtures/regression/issue-2406.js → ...fixtures/regression/issue-2406.fixture.js b/...gration/fixtures/regression/issue-2406.js → ...fixtures/regression/issue-2406.fixture.js
diff --git a/...gration/fixtures/regression/issue-2417.js → ...fixtures/regression/issue-2417.fixture.js b/...gration/fixtures/regression/issue-2417.js → ...fixtures/regression/issue-2417.fixture.js
diff --git a/test/integration/fixtures/retries/async.js → ...gration/fixtures/retries/async.fixture.js b/test/integration/fixtures/retries/async.js → ...gration/fixtures/retries/async.fixture.js
diff --git a/...ntegration/fixtures/retries/early-pass.js → ...on/fixtures/retries/early-pass.fixture.js b/...ntegration/fixtures/retries/early-pass.js → ...on/fixtures/retries/early-pass.fixture.js
diff --git a/test/integration/fixtures/retries/hooks.js → ...gration/fixtures/retries/hooks.fixture.js b/test/integration/fixtures/retries/hooks.js → ...gration/fixtures/retries/hooks.fixture.js
diff --git a/test/integration/fixtures/retries/nested.js → ...ration/fixtures/retries/nested.fixture.js b/test/integration/fixtures/retries/nested.js → ...ration/fixtures/retries/nested.fixture.js
diff --git a/test/integration/fixtures/timeout.js → test/integration/fixtures/timeout.fixture.js b/test/integration/fixtures/timeout.js → test/integration/fixtures/timeout.fixture.js
diff --git a/test/integration/fixtures/uncaught.hook.js → ...gration/fixtures/uncaught-hook.fixture.js b/test/integration/fixtures/uncaught.hook.js → ...gration/fixtures/uncaught-hook.fixture.js
diff --git a/test/integration/fixtures/uncaught.js → .../integration/fixtures/uncaught.fixture.js b/test/integration/fixtures/uncaught.js → .../integration/fixtures/uncaught.fixture.js
diff --git a/test/integration/hook.err.js → test/integration/hook-err.spec.js b/test/integration/hook.err.js → 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 → test/integration/hooks.spec.js b/test/integration/hooks.js → 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 → test/integration/multiple-done.spec.js b/test/integration/multiple.done.js → 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 → test/integration/only.spec.js b/test/integration/only.js → 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);