Commit c4cf7220 authored by Andreas Brandl's avatar Andreas Brandl

Remove generic #avatar_icon helper.

parent c641dff0
...@@ -68,14 +68,6 @@ module ApplicationHelper ...@@ -68,14 +68,6 @@ module ApplicationHelper
end end
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) def avatar_icon_for_email(email = nil, size = nil, scale = 2, only_path: true)
user = User.find_by_any_email(email.try(:downcase)) user = User.find_by_any_email(email.try(:downcase))
if user if user
......
...@@ -63,34 +63,6 @@ describe ApplicationHelper do ...@@ -63,34 +63,6 @@ describe ApplicationHelper do
end end
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 describe 'avatar_icon_for_email' do
let(:user) { create(:user, avatar: File.open(uploaded_image_temp_path)) } let(:user) { create(:user, avatar: File.open(uploaded_image_temp_path)) }
......
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