kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fix helper and spec

This commit is contained in:
Maxim Rydkin 2017-09-05 23:17:53 +03:00
parent c9d76b528c
commit 0963ac3636
No known key found for this signature in database
GPG Key ID: B7BCD8B7C2B9E3B3
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/projects_helper.rb
View File

@ -17,7 +17,11 @@ module ProjectsHelper
def link_to_member_avatar(author, opts = {})
default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" }
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
def link_to_member(project, author, opts = {}, &block)

13
spec/helpers/projects_helper_spec.rb
View File

@ -192,17 +192,20 @@ describe ProjectsHelper do
end
describe '#link_to_member_avatar' do
let(:user) { create(:user) }
let(:user) { build_stubbed(:user) }
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&amp;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
describe '#link_to_member' do
let(:group) { create(:group) }
let(:project) { create(:project, group: group) }
let(:user) { create(:user) }
let(:group) { build_stubbed(:group) }
let(:project) { build_stubbed(:project, group: group) }
let(:user) { build_stubbed(:user) }
describe 'using the default options' do
it 'returns an HTML link to the user' do