kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix incorrect "stopped impersonation" log message 

Closes #21015
This commit is contained in:
Stan Hu 2016-08-23 01:06:54 -07:00
parent 148b8487b8
commit e665444724
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/impersonations_controller.rb
View File

@ -7,7 +7,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController
warden.set_user(impersonator, scope: :user) warden.set_user(impersonator, scope: :user)
Gitlab::AppLogger.info("User #{original_user.username} has stopped impersonating #{impersonator.username}") Gitlab::AppLogger.info("User #{impersonator.username} has stopped impersonating #{original_user.username}")
session[:impersonator_id] = nil session[:impersonator_id] = nil

2
spec/controllers/admin/impersonations_controller_spec.rb
View File

@ -77,6 +77,8 @@ describe Admin::ImpersonationsController do
context "when the impersonator is not blocked" do context "when the impersonator is not blocked" do
it "redirects to the impersonated user's page" 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 delete :destroy
expect(response).to redirect_to(admin_user_path(user)) expect(response).to redirect_to(admin_user_path(user))