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

Ensure append_info_to_payload is called even if an exception is raised. #17978

Merged
merged 1 commit into from
Jan 2, 2015

Conversation

kommen
Copy link
Contributor

@kommen kommen commented Dec 9, 2014

@arthurnn
Copy link
Member

arthurnn commented Dec 9, 2014

we also need the tests from #14903

@kommen
Copy link
Contributor Author

kommen commented Dec 10, 2014

@arthurnn done. The build failure in the ruby-head,GEM=railties vm looks like an unrelated ruby crash to me.

@arthurnn
Copy link
Member

@kommen we also need a changelog entry for this fix.

@kommen
Copy link
Contributor Author

kommen commented Dec 10, 2014

@arthurnn Added the changelog.

@rafaelfranca rafaelfranca merged commit 2fde159 into rails:master Jan 2, 2015
rafaelfranca added a commit that referenced this pull request Jan 2, 2015
Ensure append_info_to_payload is called even if an exception is raised.

Conflicts:
	actionpack/CHANGELOG.md
rafaelfranca added a commit that referenced this pull request Jan 2, 2015
Ensure append_info_to_payload is called even if an exception is raised.

Conflicts:
	actionpack/CHANGELOG.md
@rafaelfranca
Copy link
Member

Backported at 2d14548 and 5b043f9

rafaelfranca added a commit that referenced this pull request Jan 2, 2015
Ensure append_info_to_payload is called even if an exception is raised.

Conflicts:
	actionpack/CHANGELOG.md

Conflicts:
	actionpack/CHANGELOG.md
sgrif added a commit that referenced this pull request Jun 7, 2016
This test was broken by f650e03. It was
added by #17978, and is adequately
tested elsewhere. The reason that this breaks is that
`Controller#process` is not going to set a new response object, and we
now terminate in callbacks if the response has been sent. The only
reason that this test was calling `get` in the first place was because
the controller under test blows up if `request` was `nil`. The point
being that the failure is invalid, and I don't think we need to fix the
test in this location.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants