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

Put Icons Path in Helper

Browse source
This commit is contained in:
Tim Zallmann 2017-11-09 15:02:19 +01:00
parent 81eaf1719c
commit 687e7dea5d
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
spec/helpers/icons_helper_spec.rb
View file

@ -19,7 +19,7 @@ describe IconsHelper do
describe 'sprite_icon_path' do describe 'sprite_icon_path' do
it 'returns relative path' do it 'returns relative path' do
expect(sprite_icon_path()) expect(sprite_icon_path())
.to eq image_path("icons.svg") .to eq icons_path()
end end
context 'when an asset_host is set in the config it will return an absolute local URL' do context 'when an asset_host is set in the config it will return an absolute local URL' do
@ -30,9 +30,8 @@ describe IconsHelper do
end end
it 'returns an absolute URL on that asset host' do it 'returns an absolute URL on that asset host' do
gitlab_url = Gitlab.config.gitlab.url
expect(sprite_icon_path()) expect(sprite_icon_path())
.to eq image_path("icons.svg", host: Gitlab.config.gitlab.url) .to eq icons_path()
end end
end end
end end
@ -42,17 +41,17 @@ describe IconsHelper do
it 'returns svg icon html' do it 'returns svg icon html' do
expect(sprite_icon(icon_name).to_s) expect(sprite_icon(icon_name).to_s)
.to eq "<svg><use xlink:href=\"#{image_path("icons.svg")}##{icon_name}\"></use></svg>" .to eq "<svg><use xlink:href=\"#{icons_path()}##{icon_name}\"></use></svg>"
end end
it 'returns svg icon html + size classes' do it 'returns svg icon html + size classes' do
expect(sprite_icon(icon_name, size: 72).to_s) expect(sprite_icon(icon_name, size: 72).to_s)
.to eq "<svg class=\"s72\"><use xlink:href=\"#{image_path("icons.svg")}##{icon_name}\"></use></svg>" .to eq "<svg class=\"s72\"><use xlink:href=\"#{icons_path()}##{icon_name}\"></use></svg>"
end end
it 'returns svg icon html + size classes + additional class' do it 'returns svg icon html + size classes + additional class' do
expect(sprite_icon(icon_name, size: 72, css_class: 'icon-danger').to_s) expect(sprite_icon(icon_name, size: 72, css_class: 'icon-danger').to_s)
.to eq "<svg class=\"s72 icon-danger\"><use xlink:href=\"#{image_path("icons.svg")}#{icon_name}\"></use></svg>" .to eq "<svg class=\"s72 icon-danger\"><use xlink:href=\"#{icons_path()}#{icon_name}\"></use></svg>"
end end
end end
@ -161,4 +160,8 @@ describe IconsHelper do
expect(file_type_icon_class('file', 0, 'CHANGELOG')).to eq 'file-text-o' expect(file_type_icon_class('file', 0, 'CHANGELOG')).to eq 'file-text-o'
end end
end end
def icons_path
ActionController::Base.helpers.image_path("icons.svg", host: Gitlab.config.gitlab.url)
end
end end