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

Remove generic #avatar_icon helper.

This commit is contained in:
Andreas Brandl 2018-02-09 13:28:59 +01:00
parent c641dff094
commit c4cf722014
2 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/application_helper.rb
View File

@ -68,14 +68,6 @@ module ApplicationHelper
end
end
def avatar_icon(user_or_email = nil, size = nil, scale = 2, only_path: true)
if user_or_email.is_a?(User)
avatar_icon_for_user(user_or_email, size, scale, only_path: only_path)
else
avatar_icon_for_email(user_or_email, size, scale, only_path: only_path)
end
end
def avatar_icon_for_email(email = nil, size = nil, scale = 2, only_path: true)
user = User.find_by_any_email(email.try(:downcase))
if user

28
spec/helpers/application_helper_spec.rb
View File

@ -63,34 +63,6 @@ describe ApplicationHelper do
end
end
describe 'avatar_icon' do
let(:user) { create(:user, avatar: File.open(uploaded_image_temp_path)) }
context 'using an email' do
context 'when there is a matching user' do
it 'returns a relative URL for the avatar' do
expect(helper.avatar_icon(user.email).to_s)
.to eq(user.avatar.url)
end
end
context 'when no user exists for the email' do
it 'calls gravatar_icon' do
expect(helper).to receive(:gravatar_icon).with('foo@example.com', 20, 2)
helper.avatar_icon('foo@example.com', 20, 2)
end
end
end
describe 'using a user' do
it 'returns a relative URL for the avatar' do
expect(helper.avatar_icon(user).to_s)
.to eq(user.avatar.url)
end
end
end
describe 'avatar_icon_for_email' do
let(:user) { create(:user, avatar: File.open(uploaded_image_temp_path)) }