fix helper and spec
This commit is contained in:
parent
c9d76b528c
commit
0963ac3636
|
@ -17,7 +17,11 @@ module ProjectsHelper
|
||||||
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 = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" }
|
||||||
opts = default_opts.merge(opts)
|
opts = default_opts.merge(opts)
|
||||||
image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: ['avatar', 'avatar-inline', "#{"s#{opts[:size]}" if opts[:size]}", opts[:avatar_class]].reject(&:blank?), alt: '') if opts[:avatar]
|
classes = %w[avatar avatar-inline]
|
||||||
|
classes << "s#{opts[:size]}"
|
||||||
|
classes << opts[:avatar_class] if opts[:avatar_class]
|
||||||
|
|
||||||
|
image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: classes, alt: '') if opts[:avatar]
|
||||||
end
|
end
|
||||||
|
|
||||||
def link_to_member(project, author, opts = {}, &block)
|
def link_to_member(project, author, opts = {}, &block)
|
||||||
|
|
|
@ -192,17 +192,20 @@ describe ProjectsHelper do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#link_to_member_avatar' do
|
describe '#link_to_member_avatar' do
|
||||||
let(:user) { create(:user) }
|
let(:user) { build_stubbed(:user) }
|
||||||
|
|
||||||
it 'returns image tag for member avatar' do
|
it 'returns image tag for member avatar' do
|
||||||
expect(helper.link_to_member_avatar(user)).to eq("<img width=\"16\" class=\"avatar avatar-inline s16 lazy\" alt=\"\" data-src=\"http://www.gravatar.com/avatar/a763e4acc6bc22cbabeae2638cfd4db4?s=32&d=identicon\" src=\"data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==\" />")
|
allow(helper).to receive(:image_tag).with(nil, {width: 16, class: ["avatar", "avatar-inline", "s16"], alt: ""})
|
||||||
|
allow(helper).to receive(:avatar_icon).with(user, 16)
|
||||||
|
|
||||||
|
helper.link_to_member_avatar(user)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#link_to_member' do
|
describe '#link_to_member' do
|
||||||
let(:group) { create(:group) }
|
let(:group) { build_stubbed(:group) }
|
||||||
let(:project) { create(:project, group: group) }
|
let(:project) { build_stubbed(:project, group: group) }
|
||||||
let(:user) { create(:user) }
|
let(:user) { build_stubbed(:user) }
|
||||||
|
|
||||||
describe 'using the default options' do
|
describe 'using the default options' do
|
||||||
it 'returns an HTML link to the user' do
|
it 'returns an HTML link to the user' do
|
||||||
|
|
Loading…
Reference in New Issue