Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
abb4dd16
Commit
abb4dd16
authored
Sep 07, 2017
by
Maxim Rydkin
Committed by
Rémy Coutable
Sep 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove unnecessary args from `link_to_member_avatar` method in `app/helpers/projects_helper.rb`
parent
5b2b80f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-3
spec/helpers/projects_helper_spec.rb
spec/helpers/projects_helper_spec.rb
+4
-6
No files found.
app/helpers/projects_helper.rb
View file @
abb4dd16
...
@@ -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
]
...
...
spec/helpers/projects_helper_spec.rb
View file @
abb4dd16
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment