Add latest changes from gitlab-org/gitlab@master

2 files changed, 23 insertions, 4 deletions

diff --git a/spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb b/spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb
index c1eaf1d3433..f2de73d5aea 100644
--- a/spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb
+++ b/spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb
@@ -91,15 +91,26 @@ describe Gitlab::BackgroundMigration::LegacyUploadMover do
     end
   end
 
-  context 'when no model found for the upload' do
+  context 'when no note found for the upload' do
     before do
-      legacy_upload.model = nil
+      legacy_upload.model_id = nil
+      legacy_upload.model_type = 'Note'
       expect_error_log
     end
 
     it_behaves_like 'legacy upload deletion'
   end
 
+  context 'when upload does not belong to a note' do
+    before do
+      legacy_upload.model = create(:appearance)
+    end
+
+    it 'does not remove the upload' do
+      expect { described_class.new(legacy_upload).execute }.not_to change { Upload.count }
+    end
+  end
+
   context 'when the upload move fails' do
     before do
       expect(FileUploader).to receive(:copy_to).and_raise('failed')
diff --git a/spec/lib/gitlab/background_migration/legacy_uploads_migrator_spec.rb b/spec/lib/gitlab/background_migration/legacy_uploads_migrator_spec.rb
index cabca3dbef9..85187d039c1 100644
--- a/spec/lib/gitlab/background_migration/legacy_uploads_migrator_spec.rb
+++ b/spec/lib/gitlab/background_migration/legacy_uploads_migrator_spec.rb
@@ -35,6 +35,8 @@ describe Gitlab::BackgroundMigration::LegacyUploadsMigrator do
   let!(:legacy_upload_no_file) { create_upload(note2, false) }
   let!(:legacy_upload_legacy_project) { create_upload(note_legacy) }
 
+  let!(:appearance) { create(:appearance, :with_logo) }
+
   let(:start_id) { 1 }
   let(:end_id) { 10000 }
 
@@ -52,12 +54,18 @@ describe Gitlab::BackgroundMigration::LegacyUploadsMigrator do
     expect(File.exist?(legacy_upload_legacy_project.absolute_path)).to be_falsey
   end
 
-  it 'removes all AttachmentUploader records' do
-    expect { subject }.to change { Upload.where(uploader: 'AttachmentUploader').count }.from(3).to(0)
+  it 'removes all Note AttachmentUploader records' do
+    expect { subject }.to change { Upload.where(uploader: 'AttachmentUploader').count }.from(4).to(1)
   end
 
   it 'creates new uploads for successfully migrated records' do
     expect { subject }.to change { Upload.where(uploader: 'FileUploader').count }.from(0).to(2)
   end
+
+  it 'does not remove appearance uploads' do
+    subject
+
+    expect(appearance.logo.file).to exist
+  end
 end
 # rubocop: enable RSpec/FactoriesInMigrationSpecs