Merge branch 'feature/customizable-favicon' into 'master'

Customizable favicon

Closes #15661

See merge request gitlab-org/gitlab-ce!14497

1 files changed, 29 insertions, 0 deletions

diff --git a/spec/uploaders/favicon_uploader_spec.rb b/spec/uploaders/favicon_uploader_spec.rb
new file mode 100644
index 00000000000..db8a3207f4d
--- /dev/null
+++ b/spec/uploaders/favicon_uploader_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+RSpec.describe FaviconUploader do
+  include CarrierWave::Test::Matchers
+
+  let(:uploader) { described_class.new(build_stubbed(:user)) }
+
+  after do
+    uploader.remove!
+  end
+
+  def upload_fixture(filename)
+    fixture_file_upload(Rails.root.join('spec', 'fixtures', filename))
+  end
+
+  context 'versions' do
+    before do
+      uploader.store!(upload_fixture('dk.png'))
+    end
+
+    it 'has the correct format' do
+      expect(uploader.favicon_main).to be_format('png')
+    end
+
+    it 'has the correct dimensions' do
+      expect(uploader.favicon_main).to have_dimensions(32, 32)
+    end
+  end
+end