do not override already set content-type, fixes koajs#1120

fl0w · Feb 2, 2018 · c7b620a · c7b620a
1 parent a64e4ae
commit c7b620a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/response.js b/lib/response.js
@@ -178,7 +178,7 @@ module.exports = {
 
     // json
     this.remove('Content-Length');
-    this.type = 'json';
+    if (setType) this.type = 'json';
   },
 
   /**

diff --git a/test/response/body.js b/test/response/body.js
@@ -15,14 +15,14 @@ describe('res.body=', () => {
     });
 
     describe('when body is an object', () => {
-      it('should override as json', () => {
+      it('should not override as json', () => {
         const res = response();
 
         res.body = '<em>hey</em>';
         assert.equal('text/html; charset=utf-8', res.header['content-type']);
 
         res.body = { foo: 'bar' };
-        assert.equal('application/json; charset=utf-8', res.header['content-type']);
+        assert.equal('text/html; charset=utf-8', res.header['content-type']);
       });
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -178,7 +178,7 @@ module.exports = { @@
         // json
         this.remove('Content-Length');
-        this.type = 'json';
+        if (setType) this.type = 'json';
       },
       /**
@@ Expand Down @@