diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-29 12:26:55 -0400 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-29 12:26:55 -0400 |
| commit | da4fc5b89940323888e17a1b8e2552ea81662269 (patch) | |
| tree | 20aae88b229b7d8308bad70c29de89a0477c5590 | |
| parent | ef10679418f6fca1a0bb8c0f5d57c1550e104183 (diff) | |
| download | gitlab-ce-da4fc5b89940323888e17a1b8e2552ea81662269.tar.gz | |
fix a future conflict
| -rw-r--r-- | spec/tasks/gitlab/uploads/migrate_rake_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/tasks/gitlab/uploads/migrate_rake_spec.rb b/spec/tasks/gitlab/uploads/migrate_rake_spec.rb index 8f93ffa0edd..f273992008e 100644 --- a/spec/tasks/gitlab/uploads/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/uploads/migrate_rake_spec.rb @@ -23,7 +23,8 @@ describe 'gitlab:uploads:migrate rake tasks' do shared_examples 'enqueue jobs in batch' do |batch:| it do expect(ObjectStorage::MigrateUploadsWorker) - .to receive(:enqueue!).exactly(batch).times + .to receive(:perform_async).exactly(batch).times + .and_return("A fake job.") run end |