fixed bug about end event

miniflycn · Oct 1, 2013 · 2d6d85a · 2d6d85a
1 parent 330397b
commit 2d6d85a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/lib/vaild.js b/lib/vaild.js
@@ -51,6 +51,14 @@ module.exports = (function () {
           var statusCode = res.statusCode;
           if (statusCode === 200) {
             that.emitter.emit('check', null, true);
+            res.on('data', function (data) {
+              that.emitter.emit('data', null, data);
+            });
+            res.on('end', function () {
+              that.emitter.emit('end');
+              that.url = undefined;
+              that.emitter = null;
+            });
           } else if (300 < statusCode && statusCode < 304) {
             that.fetch && req.abort();
             var emitter = that.emitter
@@ -60,21 +68,19 @@ module.exports = (function () {
             that.fetch && vaild.on('data', function (err, data) {
               emitter.emit('data', err, data);
             });
+            vaild.on('error', function (err) {
+              that.emitter.emit('error', err);
+            });
+            vaild.on('end', function () {
+              that.emitter.emit('end');
+            });
           } else {
             that.emitter.emit('check', null, false);
           }
           res.on('error', function (err) {
             req.abort();
             that.emitter.emit('data', err);
           });
-          res.on('data', function (data) {
-            that.emitter.emit('data', null, data);
-          });
-          res.on('end', function () {
-            that.emitter.emit('end');
-            that.url = undefined;
-            that.emitter = null;
-          });
         });
         req.on('error', function (err) {
           that.fetch && req.abort();

diff --git a/test/vaild.js b/test/vaild.js
@@ -145,4 +145,20 @@ describe('vaild', function () {
     assert.deepEqual(m.emitter, null);
     assert.deepEqual(m.fetch, undefined);
   });
+
+  it('should emit end event when finish validity detection', function (done) {
+    var step = 0
+      , v = vaild('http://localhost:7777/move').on('check', function (err, vaild) {
+          step.should.equal(0);
+          step = 1;
+          vaild.should.be.true;
+        }).on('data', function (err, data) {
+          step.should.equal(1);
+          step = 2;
+          data.toString().should.equal('hello world!');
+        }).on('end', function () {
+          step.should.equal(2);
+          done();
+        });
+  });
 });