Rails 5 tests passing. Fixes #220 #221
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
…enerated. The scope should be generated from the existing chained scope, rather than built from `model_class`.
…ssociation to reload is now deprecated and will be removed in Rails 5.1
Collaborator
| Thank you! 🎖
|
Closed
| Does this fix work for activerecord-5.0.0 too? I see that it has been tested against activerecord-5.0.0.rc1 but I still see hash_tree not using the STI scope on activerecord-5.0.0 Or is it just me? |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
I have created a rails-5 branch with new gemset, and all existing tests are green. You may want to merge this in to a separate rails-5 branch as I'm not claiming this is 100% problem free with Rails 5, but this PR fixes the issue I raised in #220, I've removed a few deprecation warnings from your test suite, and all existing tests are passing.
Ref #220, I have refactored how the
default_tree_scopecreates a scope. Rather than building it off_ct.model_class(which will always be the base class when STI is used), the method now explicitly accepts a scope on which to build the new scope. This ensures ifhash_treeis appended to the end of a scope chain then all the existing conditions are included in the new scope.As an aside, I don't actually know why this was working in Rails 4.2 - I suspect a bug in the internals of activerecord which is now fixed in 5.