Emit 'progress' event before parsing data

The 'progress' event is meant to indicate upload progress, not parsing progress. This patch puts things into the right order.
sled · Dec 19, 2010 · f22993a · f22993a
1 parent 2b02144
commit f22993a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/lib/formidable/incoming_form.js b/lib/formidable/incoming_form.js
@@ -115,14 +115,14 @@ IncomingForm.prototype.write = function(buffer) {
     return;
   }
 
+  this.bytesReceived += buffer.length;
+  this.emit('progress', this.bytesReceived, this.bytesExpected);
+
   var bytesParsed = this._parser.write(buffer);
   if (bytesParsed !== buffer.length) {
     this._error(new Error('parser error, '+bytesParsed+' of '+buffer.length+' bytes parsed'));
   }
 
-  this.bytesReceived += bytesParsed;
-  this.emit('progress', this.bytesReceived, this.bytesExpected);
-
   return bytesParsed;
 };
 

diff --git a/test/simple/test-incoming-form.js b/test/simple/test-incoming-form.js
@@ -260,22 +260,24 @@ test(function write() {
   form.bytesExpected = 523423;
 
   (function testBasic() {
-    gently.expect(parser, 'write', function(buffer) {
-      assert.strictEqual(buffer, BUFFER);
-      return buffer.length;
-    });
-
     gently.expect(form, 'emit', function(event, bytesReceived, bytesExpected) {
       assert.equal(event, 'progress');
       assert.equal(bytesReceived, BUFFER.length);
       assert.equal(bytesExpected, form.bytesExpected);
     });
 
+    gently.expect(parser, 'write', function(buffer) {
+      assert.strictEqual(buffer, BUFFER);
+      return buffer.length;
+    });
+
     assert.equal(form.write(BUFFER), BUFFER.length);
     assert.equal(form.bytesReceived, BUFFER.length);
   })();
 
   (function testParserError() {
+    gently.expect(form, 'emit');
+
     gently.expect(parser, 'write', function(buffer) {
       assert.strictEqual(buffer, BUFFER);
       return buffer.length - 1;
@@ -285,10 +287,8 @@ test(function write() {
       assert.ok(err.message.match(/parser error/i));
     });
 
-    gently.expect(form, 'emit');
-
     assert.equal(form.write(BUFFER), BUFFER.length - 1);
-    assert.equal(form.bytesReceived, BUFFER.length + BUFFER.length - 1);
+    assert.equal(form.bytesReceived, BUFFER.length + BUFFER.length);
   })();
 
   (function testUninitialized() {