summaryrefslogtreecommitdiff
path: root/spec/controllers/admin/users_controller_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/controllers/admin/users_controller_spec.rb')
-rw-r--r--spec/controllers/admin/users_controller_spec.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 6dc5c38cb76..6e172f53257 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -359,13 +359,12 @@ RSpec.describe Admin::UsersController do
end
end
- describe 'PUT ban/:id' do
+ describe 'PUT ban/:id', :aggregate_failures do
context 'when ban_user_feature_flag is enabled' do
it 'bans user' do
put :ban, params: { id: user.username }
- user.reload
- expect(user.banned?).to be_truthy
+ expect(user.reload.banned?).to be_truthy
expect(flash[:notice]).to eq _('Successfully banned')
end
@@ -390,21 +389,19 @@ RSpec.describe Admin::UsersController do
it 'does not ban user, renders 404' do
put :ban, params: { id: user.username }
- user.reload
- expect(user.banned?).to be_falsey
+ expect(user.reload.banned?).to be_falsey
expect(response).to have_gitlab_http_status(:not_found)
end
end
end
- describe 'PUT unban/:id' do
+ describe 'PUT unban/:id', :aggregate_failures do
let(:banned_user) { create(:user, :banned) }
it 'unbans user' do
put :unban, params: { id: banned_user.username }
- banned_user.reload
- expect(banned_user.banned?).to be_falsey
+ expect(banned_user.reload.banned?).to be_falsey
expect(flash[:notice]).to eq _('Successfully unbanned')
end
end
@@ -419,6 +416,7 @@ RSpec.describe Admin::UsersController do
put :unlock, params: { id: user.username }
user.reload
expect(user.access_locked?).to be_falsey
+ expect(flash[:notice]).to eq _('Successfully unlocked')
end
end