diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-23 21:00:39 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-24 00:12:22 +0300 |
| commit | 502598e19957c42f79e10925bb235bbf0a0c94ea (patch) | |
| tree | 7ba10630cf99bc7f925114fcba63b143330b6b8a /spec | |
| parent | 3bc866c65ed3eea7244e04fde1e8011cc9e94b51 (diff) | |
Merge branch 'fix-impersonation-log' into 'master'
Fix incorrect "stopped impersonation" log message
Minor bug: Usernames were swapped in the log message.
Closes #21015
See merge request !5949
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/controllers/admin/impersonations_controller_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/controllers/admin/impersonations_controller_spec.rb b/spec/controllers/admin/impersonations_controller_spec.rb index d5f0b289b5b..8be662974a0 100644 --- a/spec/controllers/admin/impersonations_controller_spec.rb +++ b/spec/controllers/admin/impersonations_controller_spec.rb @@ -77,6 +77,8 @@ describe Admin::ImpersonationsController do context "when the impersonator is not blocked" do it "redirects to the impersonated user's page" do + expect(Gitlab::AppLogger).to receive(:info).with("User #{impersonator.username} has stopped impersonating #{user.username}").and_call_original + delete :destroy expect(response).to redirect_to(admin_user_path(user)) |