call Gitlab::Favicon.status in serializer

this ways we can keep the `lib/gitlab/ci/status/*` classes to return the
bare favicon name as it was before.

also the favicon uploader versions are now have the same names as the
stock favicons (+ `favicon_` prefix), which makes working with the
status names easier.

2 files changed, 11 insertions, 11 deletions

diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb
index ddfa81c0b5d..51b8fda81d1 100644
--- a/spec/lib/gitlab/favicon_spec.rb
+++ b/spec/lib/gitlab/favicon_spec.rb
@@ -1,38 +1,38 @@
 require 'rails_helper'
 
 RSpec.describe Gitlab::Favicon, :request_store do
-  describe '.default' do
+  describe '.main' do
     it 'defaults to favicon.ico' do
       allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production'))
-      expect(described_class.default).to eq 'favicon.ico'
+      expect(described_class.main).to eq 'favicon.ico'
     end
 
     it 'has blue favicon for development' do
       allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development'))
-      expect(described_class.default).to eq 'favicon-blue.ico'
+      expect(described_class.main).to eq 'favicon-blue.ico'
     end
 
     it 'has yellow favicon for canary' do
       stub_env('CANARY', 'true')
-      expect(described_class.favicon).to eq 'favicon-yellow.ico'
+      expect(described_class.main).to eq 'favicon-yellow.ico'
     end
 
     it 'uses the custom favicon if a favicon appearance is present' do
       create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))
-      expect(described_class.default).to match %r{/uploads/-/system/appearance/favicon/\d+/default_dk.ico\?}
+      expect(described_class.main).to match %r{/uploads/-/system/appearance/favicon/\d+/favicon_main_dk.ico}
     end
   end
 
   describe '.status' do
-    subject { described_class.status('created') }
+    subject { described_class.status('favicon_status_created') }
 
     it 'defaults to the stock icon' do
-      expect(subject).to eq 'ci_favicons/favicon_status_created.ico'
+      expect(subject).to eq '/assets/ci_favicons/favicon_status_created.ico'
     end
 
     it 'uses the custom favicon if a favicon appearance is present' do
       create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))
-      expect(subject).to match(%r{/uploads/-/system/appearance/favicon/\d+/status_created_dk.ico\?})
+      expect(subject).to match(%r{/uploads/-/system/appearance/favicon/\d+/favicon_status_created_dk.ico})
     end
   end
 end
diff --git a/spec/uploaders/favicon_uploader_spec.rb b/spec/uploaders/favicon_uploader_spec.rb
index 5989d294112..b521670addb 100644
--- a/spec/uploaders/favicon_uploader_spec.rb
+++ b/spec/uploaders/favicon_uploader_spec.rb
@@ -19,11 +19,11 @@ RSpec.describe FaviconUploader do
     end
 
     it 'has the correct format' do
-      expect(uploader.default).to be_format('ico')
+      expect(uploader.favicon_main).to be_format('ico')
     end
 
     it 'has the correct dimensions' do
-      expect(uploader.default).to have_dimensions(32, 32)
+      expect(uploader.favicon_main).to have_dimensions(32, 32)
     end
 
     it 'generates all the status icons' do
@@ -31,7 +31,7 @@ RSpec.describe FaviconUploader do
       expect(FaviconUploader::STATUS_ICON_NAMES.count).to eq 10
 
       FaviconUploader::STATUS_ICON_NAMES.each do |status_name|
-        expect(File.exist?(uploader.status_not_found.file.file)).to be true
+        expect(File.exist?(uploader.favicon_status_not_found.file.file)).to be true
       end
     end
   end