From ef10679418f6fca1a0bb8c0f5d57c1550e104183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mica=C3=ABl=20Bergeron?= Date: Thu, 29 Mar 2018 11:05:05 -0400 Subject: fix rake migration task from ignoring Upload(store: nil) --- spec/tasks/gitlab/uploads/migrate_rake_spec.rb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'spec/tasks') diff --git a/spec/tasks/gitlab/uploads/migrate_rake_spec.rb b/spec/tasks/gitlab/uploads/migrate_rake_spec.rb index b778d26060d..8f93ffa0edd 100644 --- a/spec/tasks/gitlab/uploads/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/uploads/migrate_rake_spec.rb @@ -20,9 +20,20 @@ describe 'gitlab:uploads:migrate rake tasks' do run_rake_task("gitlab:uploads:migrate", *args) end - it 'enqueue jobs in batch' do - expect(ObjectStorage::MigrateUploadsWorker).to receive(:enqueue!).exactly(4).times + shared_examples 'enqueue jobs in batch' do |batch:| + it do + expect(ObjectStorage::MigrateUploadsWorker) + .to receive(:enqueue!).exactly(batch).times - run + run + end + end + + context 'Upload has store = nil' do + before do + Upload.where(model: projects.first(5)).update_all(store: nil) + end + + it_behaves_like 'enqueue jobs in batch', batch: 4 end end -- cgit v1.2.3