Commit c87ca832 authored by Nick Thomas's avatar Nick Thomas

Merge branch '6541-custom-favicons-not-being-replicated-by-geo' into 'master'

Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6860

See merge request gitlab-org/gitlab-ce!21200
parents f415b07d 581a946f
......@@ -46,6 +46,13 @@ FactoryBot.define do
secret SecureRandom.hex
end
trait :favicon_upload do
model { build(:appearance) }
path { File.join(secret, filename) }
uploader "FaviconUploader"
secret SecureRandom.hex
end
trait :attachment_upload do
transient do
mount_point :attachment
......
......@@ -244,9 +244,11 @@ describe Gitlab::Cleanup::ProjectUploads do
orphaned1 = create(:upload, :personal_snippet_upload, :with_file)
orphaned2 = create(:upload, :namespace_upload, :with_file)
orphaned3 = create(:upload, :attachment_upload, :with_file)
orphaned4 = create(:upload, :favicon_upload, :with_file)
paths << orphaned1.absolute_path
paths << orphaned2.absolute_path
paths << orphaned3.absolute_path
paths << orphaned4.absolute_path
Upload.delete_all
expect(logger).not_to receive(:info).with(/move|fix/i)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment