Updated tests to play nice with 0.10.

alexindigo · alexindigo · commit 932b39b773e4 · 2013-05-08T22:27:25.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,3 +2,4 @@ language: node_js
 node_js:
   - "0.6"
   - "0.8"
+  - "0.10"
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)",
   "name": "form-data",
   "description": "A module to create readable `\"multipart/form-data\"` streams.  Can be used to submit forms and file uploads to other web applications.",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "repository": {
     "type": "git",
     "url": "git://github.com/felixge/node-form-data.git"
diff --git a/test/integration/test-custom-filename.js b/test/integration/test-custom-filename.js
@@ -46,6 +46,10 @@ server.listen(common.port, function() {
     }
 
     assert.strictEqual(res.statusCode, 200);
+
+    // unstuck new streams
+    res.resume();
+
     server.close();
   });
 
diff --git a/test/integration/test-custom-headers.js b/test/integration/test-custom-headers.js
@@ -18,23 +18,12 @@ var expectedLength;
 
 var server = http.createServer(function(req, res) {
   var data = '';
-  req.setEncoding('utf8');
 
-  req.on('data', function(d) {
-    data += d;
-  });
-
-  req.on('end', function() {
-    assert.ok( data.indexOf( testHeader ) != -1 );
-
-    // content-length would be 1000+ w/actual buffer size,
-    // but smaller w/overridden size.
-    assert.ok( typeof req.headers['content-length'] !== 'undefined' );
-    assert.equal(req.headers['content-length'], expectedLength);
+  assert.ok( typeof req.headers['content-length'] !== 'undefined' );
+  assert.equal(req.headers['content-length'], expectedLength);
 
-    res.writeHead(200);
-    res.end('done');
-  });
+  res.writeHead(200);
+  res.end('done');
 });
 
 
@@ -69,6 +58,10 @@ server.listen(common.port, function() {
     }
 
     assert.strictEqual(res.statusCode, 200);
+
+    // unstuck new streams
+    res.resume();
+
     server.close();
   });
 
diff --git a/test/integration/test-http-response.js b/test/integration/test-http-response.js
@@ -45,6 +45,10 @@ http.request(options, function(res) {
       }
 
       assert.strictEqual(res.statusCode, 200);
+
+      // unstuck new streams
+      res.resume();
+
       server.close();
     });
 
diff --git a/test/integration/test-pipe.js b/test/integration/test-pipe.js
@@ -64,6 +64,10 @@ server.listen(common.port, function() {
   form.pipe(request);
 
   request.on('response', function(res) {
+
+    // unstuck new streams
+    res.resume();
+
     server.close();
   });
 });
diff --git a/test/integration/test-submit-custom.js b/test/integration/test-submit-custom.js
@@ -67,6 +67,10 @@ server.listen(common.port, function() {
     }
 
     assert.strictEqual(res.statusCode, 200);
+
+    // unstuck new streams
+    res.resume();
+
     server.close();
   });
 
diff --git a/test/integration/test-submit.js b/test/integration/test-submit.js
@@ -63,6 +63,10 @@ server.listen(common.port, function() {
     }
 
     assert.strictEqual(res.statusCode, 200);
+
+    // unstuck new streams
+    res.resume();
+
     server.close();
   });
 
diff --git a/test/run.js b/test/run.js
@@ -1,6 +1,11 @@
 #!/usr/bin/env node
 var far = require('far').create();
 
+if (process.env.verbose)
+{
+  far.verbose(process.env.verbose);
+}
+
 far.add(__dirname);
 far.include(/test-.*\.js$/);
 

-Original file line number
+Diff line change
 node_js:
   - "0.6"
   - "0.8"
 +  - "0.10"
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@ server.listen(common.port, function() {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`assert.strictEqual(res.statusCode, 200);`
	`49`	`+`
	`50`	`+ // unstuck new streams`
	`51`	`+ res.resume();`
	`52`	`+`
`49`	`53`	`server.close();`
`50`	`54`	`});`
`51`	`55`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ http.request(options, function(res) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`assert.strictEqual(res.statusCode, 200);`
	`48`	`+`
	`49`	`+ // unstuck new streams`
	`50`	`+ res.resume();`
	`51`	`+`
`48`	`52`	`server.close();`
`49`	`53`	`});`
`50`	`54`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ server.listen(common.port, function() {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`assert.strictEqual(res.statusCode, 200);`
	`70`	`+`
	`71`	`+ // unstuck new streams`
	`72`	`+ res.resume();`
	`73`	`+`
`70`	`74`	`server.close();`
`71`	`75`	`});`
`72`	`76`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ server.listen(common.port, function() {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`assert.strictEqual(res.statusCode, 200);`
	`66`	`+`
	`67`	`+ // unstuck new streams`
	`68`	`+ res.resume();`
	`69`	`+`
`66`	`70`	`server.close();`
`67`	`71`	`});`
`68`	`72`