feat: response event include data property

Reviewed-By: dead-horse <heyiyu.deadhorse@gmail.com> PR-URL: #131
node-modules · Jan 13, 2016 · 33348a8 · 33348a8
1 parent c9bd509
commit 33348a8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/lib/urllib.js b/lib/urllib.js
@@ -364,6 +364,7 @@ exports.requestWithCallback = function (url, args, callback) {
       aborted: responseAborted,
       rt: requestUsetime,
       keepAliveSocket: keepAliveSocket,
+      data: data
     };
 
     if (err) {

diff --git a/test/urllib.test.js b/test/urllib.test.js
@@ -67,6 +67,17 @@ describe('test/urllib.test.js', function () {
       });
     });
 
+    it('should include res.data', function (done) {
+      urllib.request('https://npm.taobao.org/mirrors/node/v5.1.1/SHASUMS256.txt', {timeout: 20000},
+      function (err, data, res) {
+        should.not.exist(err);
+        should.ok(Buffer.isBuffer(data));
+        res.should.status(200);
+        data.should.equal(res.data)
+        done();
+      });
+    });
+
     it('should alias curl() work', function (done) {
       urllib.curl('http://npm.taobao.org/mirrors/iojs/v1.2.0/SHASUMS256.txt', {timeout: 20000},
       function (err, data, res) {
@@ -749,7 +760,7 @@ describe('test/urllib.test.js', function () {
         err.res.should.equal(res);
         should.not.exist(data);
         should.exist(res);
-        res.should.have.keys('status', 'statusCode', 'headers', 'size', 'rt', 'aborted', 'keepAliveSocket');
+        res.should.have.keys('status', 'statusCode', 'headers', 'size', 'rt', 'aborted', 'keepAliveSocket', 'data');
         done();
       });
     });

diff --git a/test/urllib_promise.test.js b/test/urllib_promise.test.js
@@ -28,7 +28,7 @@ describe('test/urllib_promise.test.js', function () {
       result.res.should.status(200);
       result.res.should.have.header('connection');
       result.res.headers.connection.toLowerCase().should.equal('keep-alive');
-      result.res.should.have.keys('status', 'statusCode', 'headers', 'rt', 'size', 'aborted', 'keepAliveSocket');
+      result.res.should.have.keys('status', 'statusCode', 'headers', 'rt', 'size', 'aborted', 'keepAliveSocket', 'data');
       result.res.status.should.equal(200);
       result.res.rt.should.above(0);
       result.res.size.should.above(0);
@@ -68,7 +68,7 @@ describe('test/urllib_promise.test.js', function () {
       err.code.should.equal('ECONNREFUSED');
       err.status.should.equal(-1);
       err.headers.should.eql({});
-      err.res.should.have.keys('status', 'statusCode', 'headers', 'rt', 'size', 'aborted', 'keepAliveSocket');
+      err.res.should.have.keys('status', 'statusCode', 'headers', 'rt', 'size', 'aborted', 'keepAliveSocket', 'data');
       done();
     });
   });