Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extend test framework detection to ember-qunit and ember-mocha #225

Merged
merged 1 commit into from
Dec 6, 2017
Merged

Extend test framework detection to ember-qunit and ember-mocha #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ let app = new EmberApp(defaults, {
});
```

- `testGenerator` is automatically detected if `ember-cli-qunit` or
`ember-cli-mocha` are used, but can also be set to `qunit` and
`mocha` manually.
- `testGenerator` is automatically detected if `ember-qunit`/`ember-cli-qunit`
or `ember-mocha`/`ember-cli-mocha` are used, but can also be set to `qunit`
and `mocha` manually.

- `group` can be set to `false` to go back to the previous behavior where
every generated test was contained in its own separate module.
Expand Down
4 changes: 2 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ module.exports = {
var VersionChecker = require('ember-cli-version-checker');
var checker = new VersionChecker(this);

if (checker.for('ember-cli-qunit', 'npm').exists()) {
if (checker.for('ember-qunit', 'npm').exists() || checker.for('ember-cli-qunit', 'npm').exists()) {
this._testGenerator = 'qunit';
} else if (checker.for('ember-cli-mocha', 'npm').exists()) {
} else if (checker.for('ember-mocha', 'npm').exists() || checker.for('ember-cli-mocha', 'npm').exists()) {
this._testGenerator = 'mocha';
}
},
Expand Down