diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-11-10 09:28:15 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-11-10 09:28:15 +0000 |
commit | e482a4d59dae6437a64ae4ccbe6976ffced7b9ba (patch) | |
tree | 807f6a2613cc115e76cd4ea96508c62a451b07ec /spec/helpers | |
parent | b488c1616b2a209a9f4b6b37f77cab6582954ebb (diff) | |
parent | fce34b4ba80bd4dfda770ea359e09da115caf075 (diff) | |
download | gitlab-ce-e482a4d59dae6437a64ae4ccbe6976ffced7b9ba.tar.gz |
Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'
Icon Sprite URL needs to be local even if asset_host is set
See merge request gitlab-org/gitlab-ce!15289
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/icons_helper_spec.rb | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/spec/helpers/icons_helper_spec.rb b/spec/helpers/icons_helper_spec.rb index 3d79dac284f..2f23ed55d99 100644 --- a/spec/helpers/icons_helper_spec.rb +++ b/spec/helpers/icons_helper_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper' describe IconsHelper do + let(:icons_path) { ActionController::Base.helpers.image_path("icons.svg") } + describe 'icon' do it 'returns aria-hidden by default' do star = icon('star') @@ -16,22 +18,42 @@ describe IconsHelper do end end + describe 'sprite_icon_path' do + it 'returns relative path' do + expect(sprite_icon_path) + .to eq icons_path + end + + context 'when an asset_host is set in the config it will return an absolute local URL' do + let(:asset_host) { 'http://assets' } + + before do + allow(ActionController::Base).to receive(:asset_host).and_return(asset_host) + end + + it 'returns an absolute URL on that asset host' do + expect(sprite_icon_path) + .to eq ActionController::Base.helpers.image_path("icons.svg", host: Gitlab.config.gitlab.url) + end + end + end + describe 'sprite_icon' do icon_name = 'clock' it 'returns svg icon html' do expect(sprite_icon(icon_name).to_s) - .to eq "<svg><use xlink:href=\"/images/icons.svg##{icon_name}\"></use></svg>" + .to eq "<svg><use xlink:href=\"#{icons_path}##{icon_name}\"></use></svg>" end it 'returns svg icon html + size classes' do expect(sprite_icon(icon_name, size: 72).to_s) - .to eq "<svg class=\"s72\"><use xlink:href=\"/images/icons.svg##{icon_name}\"></use></svg>" + .to eq "<svg class=\"s72\"><use xlink:href=\"#{icons_path}##{icon_name}\"></use></svg>" end it 'returns svg icon html + size classes + additional class' do expect(sprite_icon(icon_name, size: 72, css_class: 'icon-danger').to_s) - .to eq "<svg class=\"s72 icon-danger\"><use xlink:href=\"/images/icons.svg##{icon_name}\"></use></svg>" + .to eq "<svg class=\"s72 icon-danger\"><use xlink:href=\"#{icons_path}##{icon_name}\"></use></svg>" end end |