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

Fix keyed defaults with root #25913

Merged
merged 2 commits into from
Jul 27, 2016

Conversation

chrisarcand
Copy link
Contributor

Summary

The merging of the 'defaults' option was moved up the stack in e852daa. This allows us to see where these options originate from the standard HttpHelpers (get, post, patch, put, delete)

Unfortunately this move didn't incorporate the 'root' method, which has always allowed the same 'defaults' option.

In short, these routes should be the same (Tested in Rails 3.2, 4.2, 5.0)

get "/", to: "something#show", defaults: { something: "something" }

root to: "something#show", defaults: { something: "something" } # defaults broken in 5.0

My thanks to @jrafanie for helping bisect this issue and find the regression!

The merging of the 'defaults' option was moved up the stack in e852daa
This allows us to see where these options originate from the standard
HttpHelpers (get, post, patch, put, delete)

Unfortunately this move didn't incorporate the 'root' method, which has
always allowed the same 'defaults' option before.
@rails-bot
Copy link

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @rafaelfranca (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@maclover7
Copy link
Contributor

👍 Thank you for finding and submitting a PR to fix! Action Pack tests are passing here, but build is failing due to a Sprockets issue which should be resolved shortly.

@chrisarcand
Copy link
Contributor Author

chrisarcand commented Jul 25, 2016

Tests are 💚 again.

EDIT: Er...looked green, looks like only Code Climate ran. Travis is having some big issues today.

@chrisarcand
Copy link
Contributor Author

chrisarcand commented Jul 26, 2016

Whew. Finally ready for a look, @rafaelfranca

@rafaelfranca
Copy link
Member

Backported in ec07105

rafaelfranca added a commit that referenced this pull request Jul 27, 2016
@rafaelfranca rafaelfranca merged commit 2a946da into rails:master Jul 27, 2016
rafaelfranca added a commit that referenced this pull request Jul 27, 2016
@chrisarcand
Copy link
Contributor Author

❤️

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

4 participants