diff --git a/lib/runner.js b/lib/runner.js index 473e751..786286d 100644 --- a/lib/runner.js +++ b/lib/runner.js @@ -52,12 +52,6 @@ var Runner = function(params) { delete data.toolsResults.phantomas.metrics.scrollExecutionTree; delete data.toolsResults.phantomas.offenders.scrollExecutionTree; - return data; - - }) - - .then(function(data) { - // Finished! deferred.resolve(data); diff --git a/lib/tools/weightChecker/weightChecker.js b/lib/tools/weightChecker/weightChecker.js index dfc00b3..b09d029 100644 --- a/lib/tools/weightChecker/weightChecker.js +++ b/lib/tools/weightChecker/weightChecker.js @@ -155,6 +155,7 @@ var WeightChecker = function() { requests.forEach(function(req) { var weight = ((typeof req.weightCheck.bodySize === 'number') ? req.weightCheck.bodySize + req.weightCheck.headersSize : req.contentLength) || 0; var type = req.type || 'other'; + type = (results.byType[type]) ? type : 'other'; results.totalWeight += weight; results.byType[type].totalWeight += weight; @@ -275,6 +276,8 @@ var WeightChecker = function() { requests.forEach(function(req) { if (req.url !== 'about:blank') { var type = req.type || 'other'; + type = (results.byType[type]) ? type : 'other'; + results.byType[type].push(req.url); results.total ++; } diff --git a/test/core/weightCheckerTest.js b/test/core/weightCheckerTest.js index 6e68d67..2e93bea 100644 --- a/test/core/weightCheckerTest.js +++ b/test/core/weightCheckerTest.js @@ -84,6 +84,18 @@ describe('weightChecker', function() { isCSS: true, type: 'css' }, + { + method: 'GET', + url: 'http://localhost:8388/xml.xml', + requestHeaders: { + 'User-Agent': 'something', + Referer: 'http://www.google.fr/', + Accept: '*/*' + }, + status: 200, + isXML: true, + type: 'xml' + }, { method: 'GET', url: 'about:blank', @@ -122,7 +134,7 @@ describe('weightChecker', function() { data.toolsResults.weightChecker.offenders.totalWeight.byType.js.requests.length.should.equal(2); data.toolsResults.weightChecker.offenders.totalWeight.byType.css.requests.length.should.equal(1); data.toolsResults.weightChecker.offenders.totalWeight.byType.image.requests.length.should.equal(2); - data.toolsResults.weightChecker.offenders.totalWeight.byType.other.requests.length.should.equal(0); + data.toolsResults.weightChecker.offenders.totalWeight.byType.other.requests.length.should.equal(1); data.toolsResults.weightChecker.offenders.should.have.a.property('imageOptimization'); data.toolsResults.weightChecker.offenders.imageOptimization.totalGain.should.be.above(0); @@ -130,13 +142,13 @@ describe('weightChecker', function() { data.toolsResults.weightChecker.offenders.should.have.a.property('gzipCompression'); data.toolsResults.weightChecker.offenders.gzipCompression.totalGain.should.be.above(0); - data.toolsResults.weightChecker.offenders.gzipCompression.files.length.should.equal(4); + data.toolsResults.weightChecker.offenders.gzipCompression.files.length.should.equal(5); data.toolsResults.weightChecker.offenders.should.have.a.property('fileMinification'); data.toolsResults.weightChecker.offenders.fileMinification.totalGain.should.be.above(0); data.toolsResults.weightChecker.offenders.fileMinification.files.length.should.equal(2); - data.toolsResults.weightChecker.metrics.should.have.a.property('totalRequests').that.equals(6); + data.toolsResults.weightChecker.metrics.should.have.a.property('totalRequests').that.equals(7); data.toolsResults.weightChecker.offenders.should.have.a.property('totalRequests'); data.toolsResults.weightChecker.offenders.totalRequests.byType.html.length.should.equal(1); data.toolsResults.weightChecker.offenders.totalRequests.byType.js.length.should.equal(2); @@ -145,7 +157,7 @@ describe('weightChecker', function() { data.toolsResults.weightChecker.offenders.totalRequests.byType.json.length.should.equal(0); data.toolsResults.weightChecker.offenders.totalRequests.byType.webfont.length.should.equal(0); data.toolsResults.weightChecker.offenders.totalRequests.byType.video.length.should.equal(0); - data.toolsResults.weightChecker.offenders.totalRequests.byType.other.length.should.equal(0); + data.toolsResults.weightChecker.offenders.totalRequests.byType.other.length.should.equal(1); data.toolsResults.weightChecker.metrics.should.have.a.property('smallRequests').that.equals(0); data.toolsResults.weightChecker.offenders.should.have.a.property('smallRequests'); diff --git a/test/www/xml.xml b/test/www/xml.xml new file mode 100644 index 0000000..2a341b7 --- /dev/null +++ b/test/www/xml.xml @@ -0,0 +1,80 @@ + + + + Gambardella, Matthew + XML Developer's Guide + Computer + 44.95 + 2000-10-01 + An in-depth look at creating applications + with XML. + + + Ralls, Kim + Midnight Rain + Fantasy + 5.95 + 2000-12-16 + A former architect battles corporate zombies, + an evil sorceress, and her own childhood to become queen + of the world. + + + Corets, Eva + Maeve Ascendant + Fantasy + 5.95 + 2000-11-17 + After the collapse of a nanotechnology + society in England, the young survivors lay the + foundation for a new society. + + + Corets, Eva + Oberon's Legacy + Fantasy + 5.95 + 2001-03-10 + In post-apocalypse England, the mysterious + agent known only as Oberon helps to create a new life + for the inhabitants of London. Sequel to Maeve + Ascendant. + + + Corets, Eva + The Sundered Grail + Fantasy + 5.95 + 2001-09-10 + The two daughters of Maeve, half-sisters, + battle one another for control of England. Sequel to + Oberon's Legacy. + + + Randall, Cynthia + Lover Birds + Romance + 4.95 + 2000-09-02 + When Carla meets Paul at an ornithology + conference, tempers fly as feathers get ruffled. + + + Thurman, Paula + Splish Splash + Romance + 4.95 + 2000-11-02 + A deep sea diver finds true love twenty + thousand leagues beneath the sea. + + + Knorr, Stefan + Creepy Crawlies + Horror + 4.95 + 2000-12-06 + An anthology of horror stories about roaches, + centipedes, scorpions and other insects. + + \ No newline at end of file