Commit a298f694 authored by Robert Speicher's avatar Robert Speicher

Use `User#avatar_url` instead of `avatar_icon` helper

parent 7a3b7629
...@@ -49,12 +49,10 @@ module PageLayoutHelper ...@@ -49,12 +49,10 @@ module PageLayoutHelper
def page_image def page_image
default = image_url('gitlab_logo.png') default = image_url('gitlab_logo.png')
if @project subject = @project || @user || @group
@project.avatar_url || default
elsif @user if subject.present?
avatar_icon(@user) subject.avatar_url || default
elsif @group
@group.avatar_url || default
else else
default default
end end
......
...@@ -70,49 +70,30 @@ describe PageLayoutHelper do ...@@ -70,49 +70,30 @@ describe PageLayoutHelper do
expect(helper.page_image).to end_with 'assets/gitlab_logo.png' expect(helper.page_image).to end_with 'assets/gitlab_logo.png'
end end
context 'with @project' do %w(project user group).each do |type|
it 'uses Project avatar if available' do context "with @#{type} assigned" do
project = double(avatar_url: 'http://example.com/uploads/avatar.png') it "uses #{type.titlecase} avatar if available" do
assign(:project, project) object = double(avatar_url: 'http://example.com/uploads/avatar.png')
assign(type, object)
expect(helper.page_image).to eq project.avatar_url expect(helper.page_image).to eq object.avatar_url
end end
it 'falls back to the default' do it 'falls back to the default when avatar_url is nil' do
project = double(avatar_url: nil) object = double(avatar_url: nil)
assign(:project, project) assign(type, object)
expect(helper.page_image).to end_with 'assets/gitlab_logo.png' expect(helper.page_image).to end_with 'assets/gitlab_logo.png'
end end
end end
context 'with @user' do context "with no assignments" do
it 'delegates to avatar_icon helper' do
user = double('User')
assign(:user, user)
expect(helper).to receive(:avatar_icon).with(user)
helper.page_image
end
end
context 'with @group' do
it 'uses Group avatar if available' do
group = double(avatar_url: 'http://example.com/uploads/avatar.png')
assign(:group, group)
expect(helper.page_image).to eq group.avatar_url
end
it 'falls back to the default' do it 'falls back to the default' do
group = double(avatar_url: nil)
assign(:group, group)
expect(helper.page_image).to end_with 'assets/gitlab_logo.png' expect(helper.page_image).to end_with 'assets/gitlab_logo.png'
end end
end end
end end
end
describe 'page_card_attributes' do describe 'page_card_attributes' do
it 'raises ArgumentError when given more than two attributes' do it 'raises ArgumentError when given more than two attributes' do
......
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