Fix 204 response on fetch

marmelab · Sep 28, 2015 · 9f6a927 · 9f6a927
1 parent 15c8343
commit 9f6a927
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 9 deletions.
diff --git a/dist/es5/http/fetch.js b/dist/es5/http/fetch.js
@@ -15,7 +15,7 @@ exports['default'] = function (fetch) {
         }
 
         return fetch(url, config).then(function (response) {
-            return response.json().then(function (json) {
+            return (response.status === 204 ? Promise.resolve(null) : response.json()).then(function (json) {
                 var headers = {};
 
                 response.headers.forEach(function (value, name) {

diff --git a/dist/restful.js b/dist/restful.js
@@ -5482,7 +5482,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        }
 
 	        return fetch(url, config).then(function (response) {
-	            return response.json().then(function (json) {
+	            return (response.status === 204 ? Promise.resolve(null) : response.json()).then(function (json) {
 	                var headers = {};
 
 	                response.headers.forEach(function (value, name) {

diff --git a/dist/restful.min.js b/dist/restful.min.js
diff --git a/dist/restful.standalone.js b/dist/restful.standalone.js
@@ -5493,7 +5493,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        }
 
 	        return fetch(url, config).then(function (response) {
-	            return response.json().then(function (json) {
+	            return (response.status === 204 ? Promise.resolve(null) : response.json()).then(function (json) {
 	                var headers = {};
 
 	                response.headers.forEach(function (value, name) {

diff --git a/dist/restful.standalone.min.js b/dist/restful.standalone.min.js
diff --git a/src/http/fetch.js b/src/http/fetch.js
@@ -10,7 +10,7 @@ export default function(fetch) {
 
         return fetch(url, config)
             .then((response) => {
-                return response.json().then((json) => {
+                return (response.status === 204 ? Promise.resolve(null) : response.json()).then((json) => {
                     const headers = {};
 
                     response.headers.forEach((value, name) => {

diff --git a/test/src/http/fetchSpec.js b/test/src/http/fetchSpec.js
@@ -14,7 +14,7 @@ describe('Fetch HTTP Backend', () => {
                     cb('here', 'test');
                 },
             },
-            json: () => Promise.resolve({ content: 'Yes' }),
+            json: sinon.stub().returns(Promise.resolve({ content: 'Yes' })),
             status: 200,
         };
         fetch = sinon.stub().returns(Promise.resolve(response));
@@ -102,6 +102,35 @@ describe('Fetch HTTP Backend', () => {
         .catch(done);
     });
 
+    it('should correctly format the response when it succeed and returns 204 as status code', (done) => {
+        response.status = 204;
+        httpBackend({
+            data: {
+                me: 'you',
+            },
+            headers: {
+                'Content-Type': 'application/json;charset=UTF-8',
+            },
+            params: {
+                asc: 1,
+            },
+            url: '/url',
+        })
+        .then((_response) => {
+            expect(_response).to.deep.equal({
+                data: null,
+                headers: {
+                    test: 'here',
+                },
+                statusCode: 204,
+            });
+
+            expect(response.json.callCount).to.equal(0);
+            done();
+        })
+        .catch(done);
+    });
+
     it('should correctly format the error when it fails', (done) => {
         response.status = 404;
         response.statusText = 'Not Found';