Fixing pretty bad bug from the composable refactor.

request · Feb 24, 2012 · 97386b5 · 97386b5
1 parent eed57af
commit 97386b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/main.js b/main.js
@@ -439,7 +439,7 @@ Request.prototype.start = function () {
             response.body = buffer.join('')
           }
 
-          if (self.json) {
+          if (self._json) {
             try {
               response.body = JSON.parse(response.body)
             } catch (e) {}
@@ -554,6 +554,7 @@ Request.prototype.multipart = function (multipart) {
 Request.prototype.json = function (val) {
   this.setHeader('content-type', 'application/json')
   this.setHeader('accept', 'application/json')
+  this._json = true
   if (typeof val === 'boolean') {
     if (typeof this.body === 'object') this.body = JSON.stringify(this.body)
   } else {

diff --git a/tests/test-defaults.js b/tests/test-defaults.js
@@ -44,7 +44,7 @@ s.listen(s.port, function () {
   });
 
   // test .del(string, function)
-  request.defaults({headers:{foo:"bar"}}).del(s.url + '/del', function (e, r, b){
+  request.defaults({headers:{foo:"bar"}, json:true}).del(s.url + '/del', function (e, r, b){
     if (e) throw e;
     assert.deepEqual('bar', b.foo);
     counter += 1;