summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/favicon_spec.rb
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2017-12-07 13:15:49 +0100
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 16:20:22 +0200
commit949c30d42b91a0dd3959a3ca303b8f76158a2556 (patch)
treef7a511a20399a065258aa8895852e58c85c4cef0 /spec/lib/gitlab/favicon_spec.rb
parent9e14f437b6ed205744d916f5566ee2c11e52b734 (diff)
downloadgitlab-ce-949c30d42b91a0dd3959a3ca303b8f76158a2556.tar.gz
remove all .ico favicon variations, use png always
the ci status icons are generated client side, wo we don't need the static files anymore.
Diffstat (limited to 'spec/lib/gitlab/favicon_spec.rb')
-rw-r--r--spec/lib/gitlab/favicon_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb
index 22b9c631ed8..fdc5c0180e4 100644
--- a/spec/lib/gitlab/favicon_spec.rb
+++ b/spec/lib/gitlab/favicon_spec.rb
@@ -2,19 +2,19 @@ require 'rails_helper'
RSpec.describe Gitlab::Favicon, :request_store do
describe '.main' do
- it 'defaults to favicon.ico' do
+ it 'defaults to favicon.png' do
allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production'))
- expect(described_class.main).to eq 'favicon.ico'
+ expect(described_class.main).to match_asset_path '/assets/favicon.png'
end
it 'has blue favicon for development' do
allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development'))
- expect(described_class.main).to eq 'favicon-blue.ico'
+ expect(described_class.main).to match_asset_path '/assets/favicon-blue.png'
end
it 'has yellow favicon for canary' do
stub_env('CANARY', 'true')
- expect(described_class.main).to eq 'favicon-yellow.ico'
+ expect(described_class.main).to match_asset_path 'favicon-yellow.png'
end
it 'uses the custom favicon if a favicon appearance is present' do
@@ -27,7 +27,7 @@ RSpec.describe Gitlab::Favicon, :request_store do
subject { described_class.status_overlay('favicon_status_created') }
it 'returns the overlay for the status' do
- expect(subject).to eq '/assets/ci_favicons/overlays/favicon_status_created.png'
+ expect(subject).to match_asset_path '/assets/ci_favicons/favicon_status_created.png'
end
end