Merge pull request #309 from macbre/webp-content-type

requestMonitor: improvements
macbre · May 13, 2014 · 90aa775 · 90aa775
2 parents 2930609 + addf263
commit 90aa775
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/core/modules/requestsMonitor/requestsMonitor.js b/core/modules/requestsMonitor/requestsMonitor.js
@@ -167,6 +167,7 @@ exports.module = function(phantomas) {
 						case 'content-type':
 							// parse header value
 							var value = header.value.split(';').shift().toLowerCase();
+							entry.contentType = value;
 
 							switch(value) {
 								case 'text/html':
@@ -195,6 +196,7 @@ exports.module = function(phantomas) {
 								case 'image/jpeg':
 								case 'image/gif':
 								case 'image/svg+xml':
+								case 'image/webp':
 									entry.type = 'image';
 									entry.isImage = true;
 									break;

diff --git a/test/modules/requestsMonitor-test.js b/test/modules/requestsMonitor-test.js
@@ -102,6 +102,10 @@ vows.describe('requestMonitor').addBatch({
 		'isBase64 is set': assertField('isBase64', true)
 	},
 }).addBatch({
+	'content type is properly passed': {
+		topic: recvContentType('text/html'),
+		'entry.contentType is set': assertField('contentType', 'text/html')
+	},
 	'HTML is properly detected': {
 		topic: recvContentType('text/html'),
 		'isHTML is set': assertField('isHTML', true)
@@ -134,6 +138,10 @@ vows.describe('requestMonitor').addBatch({
 		topic: recvContentType('image/svg+xml'),
 		'isImage is set': assertField('isImage', true)
 	},
+	'WEBP image is properly detected': {
+		topic: recvContentType('image/webp'),
+		'isImage is set': assertField('isImage', true)
+	},
 	'Web font is properly detected (via MIME)': {
 		topic: recvContentType('application/font-woff'),
 		'isWebFont is set': assertField('isWebFont', true)