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
6168e33e
Commit
6168e33e
authored
Oct 03, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Test
parent
1b752968
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
app/helpers/lazy_image_tag_helper.rb
app/helpers/lazy_image_tag_helper.rb
+3
-3
spec/helpers/groups_helper_spec.rb
spec/helpers/groups_helper_spec.rb
+1
-2
No files found.
app/helpers/lazy_image_tag_helper.rb
View file @
6168e33e
...
@@ -9,10 +9,10 @@ module LazyImageTagHelper
...
@@ -9,10 +9,10 @@ module LazyImageTagHelper
unless
options
.
delete
(
:lazy
)
==
false
unless
options
.
delete
(
:lazy
)
==
false
options
[
:data
]
||=
{}
options
[
:data
]
||=
{}
unless
options
.
delete
(
:use_original_source
)
if
options
.
delete
(
:use_original_source
)
options
[
:data
][
:src
]
=
path_to_image
(
source
)
else
options
[
:data
][
:src
]
=
source
options
[
:data
][
:src
]
=
source
else
options
[
:data
][
:src
]
=
path_to_image
(
source
)
end
end
options
[
:class
]
||=
""
options
[
:class
]
||=
""
options
[
:class
]
<<
" lazy"
options
[
:class
]
<<
" lazy"
...
...
spec/helpers/groups_helper_spec.rb
View file @
6168e33e
...
@@ -48,9 +48,8 @@ describe GroupsHelper do
...
@@ -48,9 +48,8 @@ describe GroupsHelper do
it
'returns an based url for the avatar if private'
do
it
'returns an based url for the avatar if private'
do
allow
(
ActionController
::
Base
).
to
receive
(
:asset_host
).
and_return
(
asset_host
)
allow
(
ActionController
::
Base
).
to
receive
(
:asset_host
).
and_return
(
asset_host
)
group
=
create
(
:group
)
group
=
create
(
:group
,
:private
)
group
.
avatar
=
fixture_file_upload
(
avatar_file_path
)
group
.
avatar
=
fixture_file_upload
(
avatar_file_path
)
group
.
private
=
true
group
.
save!
group
.
save!
expect
(
group_icon_url
(
group
.
path
).
to_s
)
expect
(
group_icon_url
(
group
.
path
).
to_s
)
.
to
match
(
"/uploads/-/system/group/avatar/
#{
group
.
id
}
/banana_sample.gif"
)
.
to
match
(
"/uploads/-/system/group/avatar/
#{
group
.
id
}
/banana_sample.gif"
)
...
...
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