summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-11-24 00:49:04 -0800
committerMichael Kozono <mkozono@gmail.com>2017-12-01 15:26:42 -0800
commit473ddfb453d820f1a32fb48477e17ba45bdbd2f0 (patch)
treeaa64312ad413539aec7e0091e143b25628a313c0 /spec/lib
parent61a73cadb7f21de9f863fc1a16f13880861ac9f4 (diff)
downloadgitlab-ce-473ddfb453d820f1a32fb48477e17ba45bdbd2f0.tar.gz
Don’t recreate deleted uploads
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
index 623725bffca..85da8ac5b1e 100644
--- a/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
+++ b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
@@ -392,37 +392,37 @@ describe Gitlab::BackgroundMigration::PopulateUntrackedUploads::UntrackedFile do
context 'for an appearance logo file path' do
it 'returns the ID as a string' do
- assert_model_id('/-/system/appearance/logo/1/some_logo.jpg', '1')
+ assert_model_id('/-/system/appearance/logo/1/some_logo.jpg', 1)
end
end
context 'for an appearance header_logo file path' do
it 'returns the ID as a string' do
- assert_model_id('/-/system/appearance/header_logo/1/some_logo.jpg', '1')
+ assert_model_id('/-/system/appearance/header_logo/1/some_logo.jpg', 1)
end
end
context 'for a pre-Markdown Note attachment file path' do
it 'returns the ID as a string' do
- assert_model_id('/-/system/note/attachment/1234/some_attachment.pdf', '1234')
+ assert_model_id('/-/system/note/attachment/1234/some_attachment.pdf', 1234)
end
end
context 'for a user avatar file path' do
it 'returns the ID as a string' do
- assert_model_id('/-/system/user/avatar/1234/avatar.jpg', '1234')
+ assert_model_id('/-/system/user/avatar/1234/avatar.jpg', 1234)
end
end
context 'for a group avatar file path' do
it 'returns the ID as a string' do
- assert_model_id('/-/system/group/avatar/1234/avatar.jpg', '1234')
+ assert_model_id('/-/system/group/avatar/1234/avatar.jpg', 1234)
end
end
context 'for a project avatar file path' do
it 'returns the ID as a string' do
- assert_model_id('/-/system/project/avatar/1234/avatar.jpg', '1234')
+ assert_model_id('/-/system/project/avatar/1234/avatar.jpg', 1234)
end
end
@@ -430,7 +430,7 @@ describe Gitlab::BackgroundMigration::PopulateUntrackedUploads::UntrackedFile do
it 'returns the ID as a string' do
project = create(:project)
- assert_model_id("/#{project.full_path}/#{SecureRandom.hex}/Some file.jpg", project.id.to_s)
+ assert_model_id("/#{project.full_path}/#{SecureRandom.hex}/Some file.jpg", project.id)
end
end
end