summaryrefslogtreecommitdiff
path: root/spec/uploaders
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-09-28 13:57:08 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 16:20:21 +0200
commit67fe0a17d87a7a5380b41e04ef23212d5da637ba (patch)
tree2be846ca693640f73058ebd0dd1b39b06e3f2666 /spec/uploaders
parent40ffa8401b96dda5f67ea699dbcca0ff64263810 (diff)
downloadgitlab-ce-67fe0a17d87a7a5380b41e04ef23212d5da637ba.tar.gz
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.
Diffstat (limited to 'spec/uploaders')
-rw-r--r--spec/uploaders/favicon_uploader_spec.rb6
1 files changed, 3 insertions, 3 deletions
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