Merge pull request #2 from gergelyke/master

Handling empty responses in the json parser

lib/hippie/parsers.js

@@ -1,7 +1,7 @@
 /**
  * Parse JSON.
  *
- * @param {Object} data
+ * @param {Object} data - if empty(eg: HTTP 204, HTTP 304) then not parsed
  * @param {Function} fn
  * @api public
  */
@@ -10,10 +10,12 @@ exports.json = function(data, fn) {
   var res = null;
   var err = null;
 
-  try {
-    res = JSON.parse(data);
-  } catch (e) {
-    err = e;
+  if (data) {
+    try {
+      res = JSON.parse(data);
+    } catch (e) {
+      err = e;
+    }
   }
 
   fn(err, res);

test/json.test.js

@@ -38,4 +38,12 @@ describe('#json', function() {
       done();
     });
   });
+
+  it('works fine if the response is empty', function(done) {
+    api()
+      .json()
+      .get('/empty-response')
+      .expectStatus(204)
+      .end(done);
+  });
 });

test/support/server.js

@@ -32,6 +32,10 @@ app.post('/send-json', express.json(), function(req, res) {
   res.send(JSON.stringify(req.body));
 });
 
+app.get('/empty-response', function(req, res) {
+  res.send(204);
+});
+
 app.get('/auth', express.basicAuth('user', 'pass'), function(req, res) {
   res.send('ok');
 });