Browse Source

Prevent suppression of defaults in ava-files (#878)

* fix(cli): Remove default files from CLI

The default files should be in one place (`ava-files.js`).
Right now the defaults provided in `ava-files.js` aren't being used
because the CLI pre-populates them.

Closes #875

* Fixup #876
browser-support
James Talmage 9 years ago
parent
commit
ab3418fe62
  1. 7
      cli.js
  2. 39
      test/ava-files.js
  3. 1
      test/fixture/ava-files/default-patterns/sub/directory/__tests__/_foo.js
  4. 1
      test/fixture/ava-files/default-patterns/sub/directory/__tests__/fixtures/foo.js
  5. 1
      test/fixture/ava-files/default-patterns/sub/directory/__tests__/foo.js
  6. 1
      test/fixture/ava-files/default-patterns/sub/directory/__tests__/helpers/foo.js
  7. 1
      test/fixture/ava-files/default-patterns/sub/directory/bar.test.js
  8. 1
      test/fixture/ava-files/default-patterns/test-foo.js
  9. 1
      test/fixture/ava-files/default-patterns/test.js
  10. 1
      test/fixture/ava-files/default-patterns/test/_foo-help.js
  11. 1
      test/fixture/ava-files/default-patterns/test/baz.js
  12. 1
      test/fixture/ava-files/default-patterns/test/deep/deep.js
  13. 1
      test/fixture/ava-files/default-patterns/test/fixtures/foo-fixt.js
  14. 1
      test/fixture/ava-files/default-patterns/test/helpers/test.js

7
cli.js

@ -165,13 +165,6 @@ api.on('test-run', function (runStatus) {
});
var files = cli.input.length ? cli.input : arrify(conf.files);
if (files.length === 0) {
files = [
'test.js',
'test-*.js',
'test'
];
}
if (cli.flags.watch) {
try {

39
test/ava-files.js

@ -1,7 +1,21 @@
'use strict';
var test = require('tap').test;
var path = require('path');
var tap = require('tap');
var test = tap.test;
var AvaFiles = require('../lib/ava-files');
tap.afterEach(function (done) {
// We changed the CWD in some of the tests.
process.chdir(path.join(__dirname, '..'));
done();
});
function fixture() {
var args = Array.prototype.slice.call(arguments);
args.unshift(__dirname, 'fixture', 'ava-files');
return path.join.apply(path, args);
}
test('requires new', function (t) {
var avaFiles = AvaFiles;
t.throws(function () {
@ -104,3 +118,26 @@ test('findFiles - does not return duplicates of the same file', function (t) {
t.end();
});
});
test('findFiles - finds the correct files by default', function (t) {
var fixtureDir = fixture('default-patterns');
process.chdir(fixtureDir);
var expected = [
'sub/directory/__tests__/foo.js',
'sub/directory/bar.test.js',
'test-foo.js',
'test.js',
'test/baz.js',
'test/deep/deep.js'
].map(function (file) {
return path.join(fixtureDir, file);
}).sort();
var avaFiles = new AvaFiles();
avaFiles.findTestFiles().then(function (files) {
files.sort();
t.deepEqual(files, expected);
t.end();
});
});

1
test/fixture/ava-files/default-patterns/sub/directory/__tests__/_foo.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/sub/directory/__tests__/fixtures/foo.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/sub/directory/__tests__/foo.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/sub/directory/__tests__/helpers/foo.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/sub/directory/bar.test.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/test-foo.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/test.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/test/_foo-help.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/test/baz.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/test/deep/deep.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/test/fixtures/foo-fixt.js

@ -0,0 +1 @@
// empty

1
test/fixture/ava-files/default-patterns/test/helpers/test.js

@ -0,0 +1 @@
// empty
Loading…
Cancel
Save