diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-16 21:34:55 +0300 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-26 15:33:53 +0300 |
| commit | c0047fc4738d1cf5d0feaf8595a8135505851f54 (patch) | |
| tree | b74897dd177085cafc0e93e7cec68b040406b10b | |
| parent | 2dbd31c1bb50be8bd72869c11d9600b951354f66 (diff) | |
personal snippets will now comply with `background_upload`
| -rw-r--r-- | app/uploaders/file_mover.rb | 6 | ||||
| -rw-r--r-- | app/uploaders/object_storage.rb | 1 | ||||
| -rw-r--r-- | spec/uploaders/file_mover_spec.rb | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/uploaders/file_mover.rb b/app/uploaders/file_mover.rb index 93913d2fcce..bd7736ad74e 100644 --- a/app/uploaders/file_mover.rb +++ b/app/uploaders/file_mover.rb @@ -10,7 +10,11 @@ class FileMover def execute move - uploader.record_upload if update_markdown + + if update_markdown + uploader.record_upload + uploader.schedule_background_upload + end end private diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index 132d78607d6..7218cb0a0fc 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -52,6 +52,7 @@ module ObjectStorage def schedule_background_upload(*args) return unless schedule_background_upload? + return unless upload ObjectStorage::BackgroundMoveWorker.perform_async(self.class.name, upload.class.to_s, diff --git a/spec/uploaders/file_mover_spec.rb b/spec/uploaders/file_mover_spec.rb index bc024cd307c..68b7e24776d 100644 --- a/spec/uploaders/file_mover_spec.rb +++ b/spec/uploaders/file_mover_spec.rb @@ -36,6 +36,12 @@ describe FileMover do it 'creates a new update record' do expect { subject }.to change { Upload.count }.by(1) end + + it 'schedules a background migration' do + expect_any_instance_of(PersonalFileUploader).to receive(:schedule_background_upload).once + + subject + end end context 'when update_markdown fails' do |