fix: review

Author: Alexander Vakhitov

src/callAPIMethod.js

@@ -25,20 +25,20 @@ export default function callAPI(
     const url = formatURL(APINamespace, namespace, path, query);
 
     return fetch(url, {...defaults.fetchOptions, ...fetchOptions, ...options})
-        .then( result => {
-            const promiseCallback = result[method]();
-
-            if (result.ok) {
-                return promiseCallback;
-            }
-
-            return promiseCallback
+        .then( result => result[method]()
                 .catch( () => {
-                    throw new APIError(result.status, result.statusText);
+                    if (!result.ok) {
+                        throw new APIError(result.status, result.statusText);
+                    }
+
+                    return result.body || null;
                 })
                 .then( body => {
-                    throw new APIError(result.status, result.statusText, body);
-                });
-        })
+                    if (!result.ok) {
+                        throw new APIError(result.status, result.statusText, body);
+                    }
+
+                    return body;
+                }))
         .catch( error => error);
 }

test/callAPIMethod.spec.js

@@ -6,13 +6,20 @@ import APIError from '../src/error';
 
 const matcher = '*';
 
-const ResponseGood = new Response(
+const Response200 = new Response(
     JSON.stringify({ sample: 'data'}),
     {
         status: 200
     }
 );
 
+const Response201 = new Response(
+    null,
+    {
+        status: 201
+    }
+);
+
 const Response400 = new Response(
     JSON.stringify({ sample: 'not found'}),
     {
@@ -43,14 +50,23 @@ test.serial('default params', async t => {
 });
 
 test.serial('200 reponse', async t => {
-    fetchMock.get(matcher, ResponseGood);
+    fetchMock.get(matcher, Response200);
     const result = await callAPIMethod();
 
     t.deepEqual(result, { sample: 'data' }, 'correct response body');
 
     fetchMock.restore();
 });
 
+test.serial('201 reponse', async t => {
+    fetchMock.get(matcher, Response201);
+    const result = await callAPIMethod();
+
+    t.is(result, null, 'correct response body');
+
+    fetchMock.restore();
+});
+
 test.serial('400 reponse', async t => {
     fetchMock.get(matcher, Response400);
 
@@ -74,7 +90,7 @@ test.serial('500 reponse', async t => {
 });
 
 test.serial('fetch options', async t => {
-    fetchMock.post(matcher, ResponseGood);
+    fetchMock.post(matcher, Response200);
 
     const APINamespace = 'rest-api';
     const namespace = 'user';
@@ -87,7 +103,7 @@ test.serial('fetch options', async t => {
         },
         method: 'text'
     };
-    const spyResponseGood = sinon.spy(ResponseGood, 'text');
+    const spyResponse200 = sinon.spy(Response200, 'text');
 
     fetchMock.post(matcher, {});
 
@@ -100,14 +116,14 @@ test.serial('fetch options', async t => {
         method: 'POST',
         mode: 'cors'
     }, 'correct options');
-    t.true(spyResponseGood.calledOnce);
+    t.true(spyResponse200.calledOnce);
 
-    spyResponseGood.restore();
+    spyResponse200.restore();
     fetchMock.restore();
 });
 
 test.serial('unsupported Response method', async t => {
-    fetchMock.get(matcher, ResponseGood);
+    fetchMock.get(matcher, Response200);
 
     const APINamespace = 'rest-api';
     const namespace = 'user';