diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 12:08:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 12:08:49 +0300 |
commit | 456a7247f9e88fc2518b69a1a00e905c6db6d775 (patch) | |
tree | 6235f3838cbf078d46de056442d9562ee4abbd74 /spec/controllers | |
parent | ddd268b03b6f35c68e5a89606dbfd516f72846fd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/admin/spam_logs_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/controllers/admin/users_controller_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/admin/spam_logs_controller_spec.rb b/spec/controllers/admin/spam_logs_controller_spec.rb index 6716bb8b399..ec0d8c47660 100644 --- a/spec/controllers/admin/spam_logs_controller_spec.rb +++ b/spec/controllers/admin/spam_logs_controller_spec.rb @@ -27,7 +27,7 @@ describe Admin::SpamLogsController do expect(response).to have_gitlab_http_status(:ok) end - it 'removes user and his spam logs when removing the user', :sidekiq_might_not_need_inline do + it 'removes user and their spam logs when removing the user', :sidekiq_might_not_need_inline do delete :destroy, params: { id: first_spam.id, remove_user: true } expect(flash[:notice]).to eq "User #{user.username} was successfully removed." diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 2661f8c1519..a4ce510b413 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -270,7 +270,7 @@ describe Admin::UsersController do post :update, params: params end - context 'when the admin changes his own password' do + context 'when the admin changes their own password' do it 'updates the password' do expect { update_password(admin, 'AValidPassword1') } .to change { admin.reload.encrypted_password } |