kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Valery Sizov 2018-08-14 19:21:48 +03:00
parent e610b41e24
commit 581a946f5a
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
spec/factories/uploads.rb
View file

@ -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

2
spec/lib/gitlab/cleanup/project_uploads_spec.rb
View file

@ -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)