BigW Consortium Gitlab

remove unnecessary args from `link_to_member_avatar` method in `app/helpers/projects_helper.rb`

parent 9151ca7b
...@@ -15,11 +15,9 @@ module ProjectsHelper ...@@ -15,11 +15,9 @@ module ProjectsHelper
end end
def link_to_member_avatar(author, opts = {}) def link_to_member_avatar(author, opts = {})
default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" } default_opts = { size: 16 }
opts = default_opts.merge(opts) opts = default_opts.merge(opts)
return unless opts[:avatar]
classes = %W[avatar avatar-inline s#{opts[:size]}] classes = %W[avatar avatar-inline s#{opts[:size]}]
classes << opts[:avatar_class] if opts[:avatar_class] classes << opts[:avatar_class] if opts[:avatar_class]
......
...@@ -195,23 +195,21 @@ describe ProjectsHelper do ...@@ -195,23 +195,21 @@ describe ProjectsHelper do
let(:user) { build_stubbed(:user) } let(:user) { build_stubbed(:user) }
let(:expected) { double } let(:expected) { double }
it 'returns image tag for member avatar' do before do
expect(helper).to receive(:avatar_icon).with(user, 16).and_return(expected) expect(helper).to receive(:avatar_icon).with(user, 16).and_return(expected)
end
it 'returns image tag for member avatar' do
expect(helper).to receive(:image_tag).with(expected, { width: 16, class: ["avatar", "avatar-inline", "s16"], alt: "" }) expect(helper).to receive(:image_tag).with(expected, { width: 16, class: ["avatar", "avatar-inline", "s16"], alt: "" })
helper.link_to_member_avatar(user) helper.link_to_member_avatar(user)
end end
it 'returns image tag with avatar class' do it 'returns image tag with avatar class' do
expect(helper).to receive(:avatar_icon).with(user, 16).and_return(expected)
expect(helper).to receive(:image_tag).with(expected, { width: 16, class: ["avatar", "avatar-inline", "s16", "any-avatar-class"], alt: "" }) expect(helper).to receive(:image_tag).with(expected, { width: 16, class: ["avatar", "avatar-inline", "s16", "any-avatar-class"], alt: "" })
helper.link_to_member_avatar(user, avatar_class: "any-avatar-class") helper.link_to_member_avatar(user, avatar_class: "any-avatar-class")
end end
it 'returns no image tag if avatar is nil' do
expect(helper.link_to_member_avatar(user, avatar: nil)).to eq(nil)
end
end end
describe '#link_to_member' do describe '#link_to_member' 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