Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 0 insertions, 29 deletions

diff --git a/spec/migrations/migrate_object_storage_upload_sidekiq_queue_spec.rb b/spec/migrations/migrate_object_storage_upload_sidekiq_queue_spec.rb
deleted file mode 100644
index aa4951b2f14..00000000000
--- a/spec/migrations/migrate_object_storage_upload_sidekiq_queue_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180603190921_migrate_object_storage_upload_sidekiq_queue.rb')
-
-describe MigrateObjectStorageUploadSidekiqQueue, :redis do
-  include Gitlab::Database::MigrationHelpers
-  include StubWorker
-
-  context 'when there are jobs in the queue' do
-    it 'correctly migrates queue when migrating up' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'object_storage_upload').perform_async('Something', [1])
-        stub_worker(queue: 'object_storage:object_storage_background_move').perform_async('Something', [1])
-
-        described_class.new.up
-
-        expect(sidekiq_queue_length('object_storage_upload')).to eq 0
-        expect(sidekiq_queue_length('object_storage:object_storage_background_move')).to eq 2
-      end
-    end
-  end
-
-  context 'when there are no jobs in the queues' do
-    it 'does not raise error when migrating up' do
-      expect { described_class.new.up }.not_to raise_error
-    end
-  end
-end