Merge pull request #2 from yedaodao/master

fix a bug about json middleware

Author: starlight36

modules/index.js

@@ -124,9 +124,9 @@ export const form = () => request => {
 export const json = () => request => {
   if (request.options.json) {
     request.options.body = JSON.stringify(request.options.json);
-    request.options.headers.Accept = 'application/json';
     request.options.headers['Content-Type'] = 'application/json';
   }
+  request.options.headers.Accept = 'application/json';
 
   return response => {
     const contentType = response.headers.get('Content-Type') || '';

test/test.js

@@ -178,6 +178,30 @@ describe('Middleware json', done => {
     assert.equal(request.options.headers['Content-Type'], 'application/json');
     assert.equal(request.options.headers.Accept, 'application/json');
   });
+
+  it('should handle request without body and response.', () => {
+    const request = {
+      options: {
+        headers: {},
+      },
+    };
+
+    const response = {
+      headers: {
+        get: key => {
+          assert.equal(key, 'Content-Type');
+          return 'application/json';
+        },
+      },
+      json: () => Promise.resolve(({ key: 'value' })),
+    };
+
+    json()(request)(response).then(response => {
+      assert.equal(response.jsonData, { key: 'value' });
+      done();
+    });
+    assert.equal(request.options.headers.Accept, 'application/json');
+  });
 });