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

2 files changed, 20 insertions, 41 deletions

diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index b84644d6996..f2a4afebbd1 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -49,12 +49,10 @@ module PageLayoutHelper
   def page_image
     default = image_url('gitlab_logo.png')
 
-    if @project
-      @project.avatar_url || default
-    elsif @user
-      avatar_icon(@user)
-    elsif @group
-      @group.avatar_url || default
+    subject = @project || @user || @group
+
+    if subject.present?
+      subject.avatar_url || default
     else
       default
     end
diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb
index 300dccf50ec..83aeafcf31a 100644
--- a/spec/helpers/page_layout_helper_spec.rb
+++ b/spec/helpers/page_layout_helper_spec.rb
@@ -70,46 +70,27 @@ describe PageLayoutHelper do
       expect(helper.page_image).to end_with 'assets/gitlab_logo.png'
     end
 
-    context 'with @project' do
-      it 'uses Project avatar if available' do
-        project = double(avatar_url: 'http://example.com/uploads/avatar.png')
-        assign(:project, project)
+    %w(project user group).each do |type|
+      context "with @#{type} assigned" do
+        it "uses #{type.titlecase} avatar if available" do
+          object = double(avatar_url: 'http://example.com/uploads/avatar.png')
+          assign(type, object)
 
-        expect(helper.page_image).to eq project.avatar_url
-      end
-
-      it 'falls back to the default' do
-        project = double(avatar_url: nil)
-        assign(:project, project)
-
-        expect(helper.page_image).to end_with 'assets/gitlab_logo.png'
-      end
-    end
-
-    context 'with @user' do
-      it 'delegates to avatar_icon helper' do
-        user = double('User')
-        assign(:user, user)
+          expect(helper.page_image).to eq object.avatar_url
+        end
 
-        expect(helper).to receive(:avatar_icon).with(user)
+        it 'falls back to the default when avatar_url is nil' do
+          object = double(avatar_url: nil)
+          assign(type, object)
 
-        helper.page_image
+          expect(helper.page_image).to end_with 'assets/gitlab_logo.png'
+        end
       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
-        group = double(avatar_url: nil)
-        assign(:group, group)
 
-        expect(helper.page_image).to end_with 'assets/gitlab_logo.png'
+      context "with no assignments" do
+        it 'falls back to the default' do
+          expect(helper.page_image).to end_with 'assets/gitlab_logo.png'
+        end
       end
     end
   end