Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions lib/mochaFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,21 @@ class MochaFactory {
};

mocha.loadFiles = (fn) => {
// load features
mocha.files
.filter(file => file.match(/\.feature$/))
.map(file => fs.readFileSync(file, 'utf8'))
.forEach(content => mocha.suite.addSuite(gherkinParser(content)));
if (mocha.suite.suites.length === 0) {
// load features
mocha.files
.filter(file => file.match(/\.feature$/))
.map(file => fs.readFileSync(file, 'utf8'))
.forEach(content => mocha.suite.addSuite(gherkinParser(content)));

// remove feature files
mocha.files = mocha.files.filter(file => !file.match(/\.feature$/));
// remove feature files
mocha.files = mocha.files.filter(file => !file.match(/\.feature$/));

Mocha.prototype.loadFiles.call(mocha, fn);
Mocha.prototype.loadFiles.call(mocha, fn);

// add ids for each test
mocha.suite.eachTest(test => test.id = genTestId(test));
// add ids for each test
mocha.suite.eachTest(test => test.id = genTestId(test));
}
};

// use standard reporter
Expand Down