Admin users did not work with custom user models #4238
Merged
Conversation
This file contains 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
| end | ||
|
|
||
| before do | ||
| Spree.user_class = 'UserModel' |
There was a problem hiding this comment.
I think we should do an after block here too to make sure subsequent tests are using the original User.
softr8
force-pushed
the
fix-admin-users
branch
2 times, most recently
from
893a282 to
9370d04
Compare
jarednorman
approved these changes
Jan 5, 2022
waiting-for-dev
suggested changes
Jan 10, 2022
Comment on lines
70
to
75
| Spree.user_class = 'UserModel' | ||
| UserModel.create(email: "a@solidus.io") | ||
| example.run | ||
| Spree.user_class = 'Spree::LegacyUser' | ||
| end |
There was a problem hiding this comment.
Can we take the old value of user_class and reset it later instead of hardcoding the value that we are using now? I.e.:
Suggested change
| Spree.user_class = 'UserModel' | |
| UserModel.create(email: "a@solidus.io") | |
| example.run | |
| Spree.user_class = 'Spree::LegacyUser' | |
| end | |
| actual_user_class = Spree.user_class | |
| Spree.user_class = 'UserModel' | |
| UserModel.create(email: "a@solidus.io") | |
| example.run | |
| Spree.user_class = actual_user_class | |
| end |
softr8
force-pushed
the
fix-admin-users
branch
3 times, most recently
from
8b7c9d8 to
c74f46e
Compare
| end | ||
|
|
||
| around do |example| | ||
| actual_user_class = Spree.user_class |
There was a problem hiding this comment.
Oh, my fault. This should fix the CI, right?
Suggested change
| actual_user_class = Spree.user_class | |
| actual_user_class = Spree.user_class.name |
softr8
force-pushed
the
fix-admin-users
branch
from
c74f46e to
705c7d1
Compare
If Spree.user_class was other than Spree::User, it was failing to create edit and delete url's in Admin::UsersController#index, using CustomUser for example, it tried to generate: admin_custom_user_url instead of using the existing admin_user_url
softr8
force-pushed
the
fix-admin-users
branch
from
705c7d1 to
67eccb4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
If Spree.user_class was other than Spree::User, it was failing
to create edit and delete url's in Admin::UsersController#index,
using CustomUser for example, it tried to generate: admin_custom_user_url
instead of using the existing admin_user_url
Checklist: