Skip to content

Commit ab3418f

Browse files
committed
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
1 parent abd8bd2 commit ab3418f

File tree

14 files changed

+50
-8
lines changed

14 files changed

+50
-8
lines changed

cli.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,6 @@ api.on('test-run', function (runStatus) {
165165
});
166166

167167
var files = cli.input.length ? cli.input : arrify(conf.files);
168-
if (files.length === 0) {
169-
files = [
170-
'test.js',
171-
'test-*.js',
172-
'test'
173-
];
174-
}
175168

176169
if (cli.flags.watch) {
177170
try {

test/ava-files.js

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
'use strict';
2-
var test = require('tap').test;
2+
var path = require('path');
3+
var tap = require('tap');
4+
var test = tap.test;
35
var AvaFiles = require('../lib/ava-files');
46

7+
tap.afterEach(function (done) {
8+
// We changed the CWD in some of the tests.
9+
process.chdir(path.join(__dirname, '..'));
10+
done();
11+
});
12+
13+
function fixture() {
14+
var args = Array.prototype.slice.call(arguments);
15+
args.unshift(__dirname, 'fixture', 'ava-files');
16+
return path.join.apply(path, args);
17+
}
18+
519
test('requires new', function (t) {
620
var avaFiles = AvaFiles;
721
t.throws(function () {
@@ -104,3 +118,26 @@ test('findFiles - does not return duplicates of the same file', function (t) {
104118
t.end();
105119
});
106120
});
121+
122+
test('findFiles - finds the correct files by default', function (t) {
123+
var fixtureDir = fixture('default-patterns');
124+
process.chdir(fixtureDir);
125+
126+
var expected = [
127+
'sub/directory/__tests__/foo.js',
128+
'sub/directory/bar.test.js',
129+
'test-foo.js',
130+
'test.js',
131+
'test/baz.js',
132+
'test/deep/deep.js'
133+
].map(function (file) {
134+
return path.join(fixtureDir, file);
135+
}).sort();
136+
137+
var avaFiles = new AvaFiles();
138+
avaFiles.findTestFiles().then(function (files) {
139+
files.sort();
140+
t.deepEqual(files, expected);
141+
t.end();
142+
});
143+
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty

0 commit comments

Comments
 (0)