Allow filename as third option of #append

DylanPiercey · DylanPiercey · commit d0810058c847 · 2015-07-22T13:59:43.000Z
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -21,7 +21,9 @@ util.inherits(FormData, CombinedStream);
 FormData.LINE_BREAK = '\r\n';
 
 FormData.prototype.append = function(field, value, options) {
-  options = options || {};
+  options = (typeof options === 'string')
+    ? { filename: options }
+    : options || {};
 
   var append = CombinedStream.prototype.append.bind(this);
 
diff --git a/test/integration/test-custom-filename.js b/test/integration/test-custom-filename.js
@@ -5,6 +5,7 @@ re: https://github.com/felixge/node-form-data/issues/29
 
 var common       = require('../common');
 var assert       = common.assert;
+var mime         = require('mime-types');
 var http         = require('http');
 var fs           = require('fs');
 
@@ -20,25 +21,28 @@ var server = http.createServer(function(req, res) {
 
   var form = new IncomingForm({uploadDir: common.dir.tmp});
 
-  form.parse(req);
+  form.parse(req, function (err, fields, files) {
+      assert(!err);
+    
+      assert('my_file1' in files);
+      assert.strictEqual(files['my_file1'].name, options.filename);
+      assert.strictEqual(files['my_file1'].type, options.contentType);
+
+      assert('my_file2' in files);
+      assert.strictEqual(files['my_file2'].name, options.filename);
+      assert.strictEqual(files['my_file2'].type, mime.lookup(options.filename));
 
-  form
-    .on('file', function(name, file) {
-      assert.strictEqual(name, 'my_file');
-      assert.strictEqual(file.name, options.filename);
-      assert.strictEqual(file.type, options.contentType);
-    })
-    .on('end', function() {
       res.writeHead(200);
       res.end('done');
-    });
+  });
 });
 
 
 server.listen(common.port, function() {
   var form = new FormData();
 
-  form.append('my_file', fs.createReadStream(common.dir.fixture + '/unicycle.jpg'), options);
+  form.append('my_file1', fs.createReadStream(common.dir.fixture + '/unicycle.jpg'), options);
+  form.append('my_file2', fs.createReadStream(common.dir.fixture + '/unicycle.jpg'), options.filename);
 
   form.submit('http://localhost:' + common.port + '/', function(err, res) {
     if (err) {
