Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion lib/attach-middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function reportCoverage(map, root, configPath) {
function coverageHandler(map, options, req, res) {
writeCoverage(req.body, options.fileLookup, options.root, map);
reportCoverage(map, options.root, options.configPath);
res.send(map.getCoverageSummary());
res.send(map.getCoverageSummary().toJSON());
}

// Used when app is in dev mode (`ember serve`).
Expand Down
30 changes: 11 additions & 19 deletions lib/templates/test-body-footer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<script>
// Make synchronous requests in phantom to avoid killing the runner before the coverage completes.
var REQUEST_ASYNC = !/PhantomJS/.test(window.navigator.userAgent);

function sendCoverage(callback) {
{%ENTRIES%}.forEach(function(file) {
try {
Expand All @@ -17,21 +14,14 @@
var request = new XMLHttpRequest();
request.open('POST', '/write-coverage', REQUEST_ASYNC);
request.setRequestHeader('Content-Type', 'application/json; charset=utf-8');
request.responseType = 'json';
request.send(data);

if (REQUEST_ASYNC) {
request.responseType = 'json';
request.onreadystatechange = function() {
if (request.readyState === 4) {
handleCoverageResponse(this, callback);
}
};
} else {
// The request is already done at this point, since it is synchronous
if (request.status === 200) {
handleCoverageResponse(request, callback);
request.onreadystatechange = function() {
if (request.readyState === 4) {
handleCoverageResponse(this, callback);
}
}
};
}

if (typeof Testem !== "undefined" && Testem.afterTests) {
Expand All @@ -51,11 +41,13 @@
}

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

// PhantomJS doesn't honor `responseType = 'json'`
if (typeof data === 'string') {
data = JSON.parse(data);
// avoid InvalidStateError by incorrectly accessing xhr.responseText property
if (!data && (xhr.responseType === '' || xhr.responseType === 'text')) {
data = xhr.responseText;
} else {
throw new Error(`ember-cli-code-coverage: invalid data ${JSON.stringify(data)} received for responseType ${xhr.responseType}`);
}

if (!data) {
Expand Down