-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
PR for issue #1578 #1579
PR for issue #1578 #1579
Conversation
…resent Added specs
I think this is the same as #1572, and we've been wanting a fix, right? |
lib/grape/endpoint.rb
Outdated
@@ -265,7 +265,10 @@ def run | |||
run_filters afters, :after | |||
cookies.write(header) | |||
|
|||
# The Body commonly is an Array of Strings, the application instance itself, or a File-like object. | |||
#status verifies body presence when DELETE | |||
@body ||= response_object if response_object.present? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the if
is redundant.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, i'll remove it
Run |
Added rubocop_todo
lib/grape/endpoint.rb
Outdated
# status verifies body presence when DELETE | ||
@body ||= response_object | ||
|
||
# The Body commonly is an Array of Strings, the application instance itself, or a File-like object | ||
response_object = file || [body || response_object] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe body
here is the same as @body
, so this should be file || body
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it's the same. I forgot to remove it. On it 👍
Thanks
spec/grape/endpoint_spec.rb
Outdated
@@ -1149,6 +1149,39 @@ def memoized | |||
end | |||
end | |||
|
|||
describe 'delete 200, with a return value (no explicit body)' do | |||
it 'responds to /example delete method' do | |||
subject.send(:delete, '/example', anchor: false) do |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think you need to send
these, delete
is public, so subject.delete ...
. I could be wrong.
spec/grape/endpoint_spec.rb
Outdated
subject.send(:delete, '/example', anchor: false) do | ||
'deleted' | ||
end | ||
send(:delete, '/example/') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same, just delete '/example'
, these are rack helpers. This one I am pretty sure can be done without a send.
Refactor specs
You need a CHANGELOG and it's good to go. Say that it fixes #1572. |
Merged, thanks. |
Closes #1578 and #1572