github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: saving invisible primary group field that you don't belong to

Browse Source
This commit is contained in:
Neil Lalonde
2017-05-17 12:42:04 -04:00
parent f8c503186e
commit a0f03936ff
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spec/controllers/admin/users_controller_spec.rb
View File

@ -195,6 +195,8 @@ describe Admin::UsersController do
end
context '.primary_group' do
let(:group) { Fabricate(:group) }
before do
@another_user = Fabricate(:coding_horror)
end
@ -211,9 +213,16 @@ describe Admin::UsersController do
end
it "changes the user's primary group" do
xhr :put, :primary_group, user_id: @another_user.id, primary_group_id: 2
group.add(@another_user)
xhr :put, :primary_group, user_id: @another_user.id, primary_group_id: group.id
@another_user.reload
expect(@another_user.primary_group_id).to eq(2)
expect(@another_user.primary_group_id).to eq(group.id)
end
it "doesn't change primary group if they aren't a member of the group" do
xhr :put, :primary_group, user_id: @another_user.id, primary_group_id: group.id
@another_user.reload
expect(@another_user.primary_group_id).to be_nil
end
end
@ -519,6 +528,15 @@ describe Admin::UsersController do
end
end
context 'remove_group' do
it "also clears the user's primary group" do
g = Fabricate(:group)
u = Fabricate(:user, primary_group: g)
xhr :delete, :remove_group, group_id: g.id, user_id: u.id
expect(u.reload.primary_group).to be_nil
end
end
end