Skip to content

Commit

Permalink
Fix No Files error when file is passed via --files (#3942)
Browse files Browse the repository at this point in the history
Fixes #3941
  • Loading branch information
gabegorelick authored and juergba committed Jun 27, 2019
1 parent 15b96af commit 5d4dd98
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 11 deletions.
23 changes: 12 additions & 11 deletions lib/cli/collect-files.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ module.exports = ({ignore, extension, file, recursive, sort, spec} = {}) => {
files = files.concat(newFiles);
});

const fileArgs = file.map(filepath => path.resolve(filepath));
files = files.map(filepath => path.resolve(filepath));

// ensure we don't sort the stuff from fileArgs; order is important!
if (sort) {
files.sort();
}

// add files given through --file to be ran first
files = fileArgs.concat(files);
debug('files (in order): ', files);

if (!files.length) {
// give full message details when only 1 file is missing
const noneFoundMsg =
Expand All @@ -69,16 +81,5 @@ module.exports = ({ignore, extension, file, recursive, sort, spec} = {}) => {
});
}

const fileArgs = file.map(filepath => path.resolve(filepath));
files = files.map(filepath => path.resolve(filepath));

// ensure we don't sort the stuff from fileArgs; order is important!
if (sort) {
files.sort();
}

// add files given through --file to be ran first
files = fileArgs.concat(files);
debug('files (in order): ', files);
return files;
};
12 changes: 12 additions & 0 deletions test/integration/options/file.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,16 @@ describe('--file', function() {
done();
});
});

it('should support having no other test files', function(done) {
args = ['--file', resolvePath(fixtures.alpha)];

runMochaJSON('filethatdoesnotexist.js', args, function(err, res) {
if (err) {
return done(err);
}
expect(res, 'to have passed').and('to have passed test count', 1);
done();
});
});
});

0 comments on commit 5d4dd98

Please sign in to comment.