Skip to content

Commit

Permalink
Merge pull request #1341 from rwky/formdata-error
Browse files Browse the repository at this point in the history
Emit FormData error events as Request error events
  • Loading branch information
nylen committed Jan 9, 2015
2 parents 054d375 + eaec819 commit 6931942
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
5 changes: 5 additions & 0 deletions request.js
Expand Up @@ -1428,6 +1428,11 @@ Request.prototype.form = function (form) {
}
// create form-data object
self._form = new FormData()
self._form.on('error',function(err) {
err.message = 'form-data: ' + err.message
self.emit('error', err)
self.abort()
})
return self._form
}
Request.prototype.multipart = function (multipart) {
Expand Down
34 changes: 34 additions & 0 deletions tests/test-form-data-error.js
@@ -0,0 +1,34 @@
'use strict'

var request = require('../index')
, server = require('./server')
, tape = require('tape')

var s = server.createServer()

tape('setup', function(t) {
s.listen(s.port, function() {
t.end()
})
})

tape('re-emit formData errors', function(t) {
s.on('/', function(req, res) {
res.writeHead(400)
res.end()
t.fail('The form-data error did not abort the request.')
})

request.post(s.url, function (err, res, body) {
t.equal(err.message, 'form-data: Arrays are not supported.')
setTimeout(function() {
t.end()
}, 10)
}).form().append('field', ['value1', 'value2'])
})

tape('cleanup', function(t) {
s.close(function() {
t.end()
})
})

0 comments on commit 6931942

Please sign in to comment.