Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set default application/json content-type when using json option #1772

Merged
merged 1 commit into from Sep 16, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions request.js
Expand Up @@ -1198,22 +1198,19 @@ Request.prototype.json = function (val) {
}

self._json = true
if (!self.hasHeader('content-type')) {
self.setHeader('content-type', 'application/json')
}
if (typeof val === 'boolean') {
if (self.body !== undefined) {
if (!/^application\/x-www-form-urlencoded\b/.test(self.getHeader('content-type'))) {
self.body = safeStringify(self.body)
} else {
self.body = self._qs.rfc3986(self.body)
}
if (!self.hasHeader('content-type')) {
self.setHeader('content-type', 'application/json')
}
}
} else {
self.body = safeStringify(val)
if (!self.hasHeader('content-type')) {
self.setHeader('content-type', 'application/json')
}
}

if (typeof self.jsonReviver === 'function') {
Expand Down
5 changes: 3 additions & 2 deletions tests/test-defaults.js
Expand Up @@ -73,6 +73,7 @@ tape('deep extend', function(t) {
}, function (e, r, b) {
delete b.headers.host
delete b.headers.accept
delete b.headers['content-type']
delete b.headers.connection
t.deepEqual(b.headers, { a: '1', b: '3', c: '4' })
t.deepEqual(b.qs, { a: '1', b: '3', c: '4' })
Expand All @@ -97,7 +98,7 @@ tape('post(string, object, function)', function(t) {
}).post(s.url + '/', { json: true }, function (e, r, b) {
t.equal(b.method, 'POST')
t.equal(b.headers.foo, 'bar')
t.equal(b.headers['content-type'], undefined)
t.equal(b.headers['content-type'], 'application/json')
t.end()
})
})
Expand All @@ -108,7 +109,7 @@ tape('patch(string, object, function)', function(t) {
}).patch(s.url + '/', { json: true }, function (e, r, b) {
t.equal(b.method, 'PATCH')
t.equal(b.headers.foo, 'bar')
t.equal(b.headers['content-type'], undefined)
t.equal(b.headers['content-type'], 'application/json')
t.end()
})
})
Expand Down