Commit 3ef56667 authored by Wei-Meng Lee's avatar Wei-Meng Lee

Only show in autocomplete when author active

parent d25cdca6
......@@ -31,7 +31,7 @@ module Autocomplete
# Include current user if available to filter by "Me"
items.unshift(current_user) if prepend_current_user?
if prepend_author? && (author = User.find_by_id(author_id))
if (prepend_author? && author = User.find_by_id(author_id)) && author.active?
items.unshift(author)
end
end
......
---
title: Only show in autocomplete when author active
merge_request: 27292
author:
type: fixed
......@@ -26,9 +26,17 @@ describe Autocomplete::UsersFinder do
it { is_expected.to match_array([project.owner]) }
context 'when author_id passed' do
context 'and author is active' do
let(:params) { { author_id: user1.id } }
it { is_expected.to match_array([project.owner, user1]) }
end
context 'and author is blocked' do
let(:params) { { author_id: user2.id } }
it { is_expected.to match_array([project.owner, user2]) }
it { is_expected.to match_array([project.owner]) }
end
end
end
......@@ -104,9 +112,9 @@ describe Autocomplete::UsersFinder do
end
context 'when filtered by author_id' do
let(:params) { { author_id: user2.id } }
let(:params) { { author_id: user1.id } }
it { is_expected.to match_array([user2, user1, external_user, omniauth_user, current_user]) }
it { is_expected.to match_array([user1, external_user, omniauth_user, current_user]) }
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment