diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-03 12:21:02 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-04 14:27:09 +0200 |
| commit | 6168e33e9e2f327f078e07b71c466dcc9fa9813a (patch) | |
| tree | cfb89d1ac2631ba06236491e18bef8b1fb628acd | |
| parent | 1b752968757873434404a2bf82ea360ce829ec87 (diff) | |
| download | gitlab-ce-6168e33e9e2f327f078e07b71c466dcc9fa9813a.tar.gz | |
Fixed Test
| -rw-r--r-- | app/helpers/lazy_image_tag_helper.rb | 6 | ||||
| -rw-r--r-- | spec/helpers/groups_helper_spec.rb | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/helpers/lazy_image_tag_helper.rb b/app/helpers/lazy_image_tag_helper.rb index 60df16b3373..4def806f1c0 100644 --- a/app/helpers/lazy_image_tag_helper.rb +++ b/app/helpers/lazy_image_tag_helper.rb @@ -9,10 +9,10 @@ module LazyImageTagHelper unless options.delete(:lazy) == false options[:data] ||= {} - unless options.delete(:use_original_source) - options[:data][:src] = path_to_image(source) - else + if options.delete(:use_original_source) options[:data][:src] = source + else + options[:data][:src] = path_to_image(source) end options[:class] ||= "" options[:class] << " lazy" diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb index 55de03c8ed2..4fe50d120d7 100644 --- a/spec/helpers/groups_helper_spec.rb +++ b/spec/helpers/groups_helper_spec.rb @@ -48,9 +48,8 @@ describe GroupsHelper do it 'returns an based url for the avatar if private' do 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.private = true group.save! expect(group_icon_url(group.path).to_s) .to match("/uploads/-/system/group/avatar/#{group.id}/banana_sample.gif") |