Change with_any_role and with_all_roles to return an AR relation instead of an Array#441
Open
dkniffin wants to merge 9 commits intoRolifyCommunity:masterfrom
Open
Change with_any_role and with_all_roles to return an AR relation instead of an Array#441dkniffin wants to merge 9 commits intoRolifyCommunity:masterfrom
dkniffin wants to merge 9 commits intoRolifyCommunity:masterfrom
Conversation
Member
|
Rerunning travis to see what our results are. |
Collaborator
Author
|
Ok. I might have to merge master in first. |
Member
|
@dkniffin I looked over the test failures and they appear to be legit. We're getting things like So it looks like we're adding to the list twice. |
Collaborator
Author
|
Yea. I'll look into it 👍 |
Collaborator
Author
|
@wldcordeiro Do you know why this might be happening when I try and run the tests locally?: |
dkniffin
changed the title
Collaborator
Author
|
Hmm. I'm not sure I understand why this expectation exists. Here, we set up the subject to have the roles "admin" everywhere, and "moderator" on Hopefully that makes sense. |
Member
|
@dkniffin it looks to me that we're testing in the general unscoped sense so we're saying "who has both admin and moderator" roles and the user has only moderator over the https://github.com/RolifyCommunity/rolify/wiki/Usage#finders-methods |
Collaborator
Author
|
Ok, makes sense. I'll update the code to accomodate that. I'm very glad there's good test cases around all this :) |
7 similar comments
Collaborator
Author
|
Hmm. So it's failing now with two errors. The first is a For the other, I'm not familiar with mongoid at all, so if you could provide some guidance, I'd appreciate it. |
Member
|
Somehow it does work on Rails 4.2 but still return an Array using Rails 5. Loading development environment (Rails 4.2.11)
irb(main):006:0> User.with_all_roles :toto
User Load (0.8ms) SELECT DISTINCT "users".* FROM (SELECT "users".* FROM "users" INNER JOIN "users_roles" ON "users_roles"."user_id" = "users"."id" INNER JOIN "roles" ON "roles"."id" = "users_roles"."role_id" WHERE (((roles.name IN ('toto')) AND (roles.resource_type IS NULL) AND (roles.resource_id IS NULL)))) AS users
=> #<ActiveRecord::Relation [#<User id: 1, email: "toto@example.com", created_at: "2019-02-27 18:16:18", updated_at: "2019-02-27 18:16:18">]>Loading development environment (Rails 5.2.2)
irb(main):001:0> User.with_all_roles :toto
User Load (0.2ms) SELECT "users".* FROM (SELECT "users".* FROM "users" INNER JOIN "users_roles" ON "users_roles"."user_id" = "users"."id" INNER JOIN "roles" ON "roles"."id" = "users_roles"."role_id" WHERE (((roles.name IN ('toto')) AND (roles.resource_type IS NULL) AND (roles.resource_id IS NULL)))) AS users
=> [#<User id: 1, email: "toto@example.com", created_at: "2019-02-27 15:52:58", updated_at: "2019-02-27 15:52:58">, #<User id: 2, email: "tata@example.com", created_at: "2019-02-27 15:54:14", updated_at: "2019-02-27 15:54:14">] |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Fixes #292
I couldn't run the tests locally, unfortunately, so I'm hoping they run on travis.