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.

Sign up for GitHub

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

Jump to bottom

Fix recursive defaults for convenience methods #1540

Merged
merged 1 commit into from Apr 15, 2015
Merged

Fix recursive defaults for convenience methods #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 5 deletions index.js
View file
Open in desktop
Expand Up @@ -75,7 +75,7 @@ request.cookie = function (str) {
return cookies.parse(str)
}

function wrapRequestMethod (method, options, requester) {
function wrapRequestMethod (method, options, requester, verb) {

return function (uri, opts, callback) {
var params = initParams(uri, opts, callback)
Expand All @@ -89,9 +89,8 @@ function wrapRequestMethod (method, options, requester) {
params.headers = extend(headers, params.headers)
}

if (typeof method === 'string') {
params.method = (method === 'del' ? 'DELETE' : method.toUpperCase())
method = request[method]
if (verb) {
params.method = (verb === 'del' ? 'DELETE' : verb.toUpperCase())
}

if (isFunction(requester)) {
Expand All @@ -114,7 +113,7 @@ request.defaults = function (options, requester) {

var verbs = ['get', 'head', 'post', 'put', 'patch', 'del']
verbs.forEach(function(verb) {
defaults[verb] = wrapRequestMethod(verb, options, requester)
defaults[verb] = wrapRequestMethod(self[verb], options, requester, verb)
})

defaults.cookie = wrapRequestMethod(self.cookie, options, requester)
Expand Down
7 changes: 6 additions & 1 deletion tests/test-defaults.js
View file
Open in desktop
Expand Up @@ -208,7 +208,7 @@ tape('head(object, function)', function(t) {
})

tape('recursive defaults', function(t) {
t.plan(6)
t.plan(8)

var defaultsOne = request.defaults({ headers: { foo: 'bar1' } })
, defaultsTwo = defaultsOne.defaults({ headers: { baz: 'bar2' } })
Expand All @@ -234,6 +234,11 @@ tape('recursive defaults', function(t) {
t.equal(e, null)
t.equal(b, 'TESTING!')
})

defaultsTwo.get(s.url + '/get_recursive2', function (e, r, b) {
t.equal(e, null)
t.equal(b, 'TESTING!')
})
})

tape('recursive defaults requester', function(t) {
Expand Down