Skip to content

Add mocha support and fix pretender bug #119

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

Merged
RobbieTheWagner merged 7 commits into from
Sep 30, 2017
Merged

Add mocha support and fix pretender bug #119

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
168d052
add mocha support and fix pretender bug
Jun 1, 2017
2adeb4a
Merge remote-tracking branch 'upstream/master' into add-mocha-support
mgmarcum Jun 16, 2017
090b1ff
test
mgmarcum Jun 16, 2017
dbe0e6b
test
mgmarcum Jun 16, 2017
e2b6167
Merge branch 'add-mocha-support' of github.com:mattmarcum/ember-cli-c…
Jun 19, 2017
09b20ee
add mocha support and fix pretender bug
Jun 1, 2017
5438d01
Merge branch 'add-mocha-support' of github.com:mattmarcum/ember-cli-c…
Jun 21, 2017
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
8 changes: 7 additions & 1 deletion lib/templates/test-body-footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,16 @@
QUnit.done(function() {
sendCoverage();
});
} else if (typeof Mocha !== "undefined" && typeof after !== "undefined") {
after(function(done) {
sendCoverage(done);
});
} else {
console.warn('No testing framework found for ember-cli-code-coverage to integrate with.');
}

function handleCoverageResponse(xhr, callback) {
var data = xhr.response;
var data = xhr.response || xhr.responseText;

// PhantomJS doesn't honor `responseType = 'json'`
if (typeof data === 'string') {
Expand Down