Add latest changes from gitlab-org/gitlab@master

2 files changed, 66 insertions, 0 deletions

diff --git a/spec/migrations/migrate_store_security_reports_sidekiq_queue_spec.rb b/spec/migrations/migrate_store_security_reports_sidekiq_queue_spec.rb
new file mode 100644
index 00000000000..ddffa036af1
--- /dev/null
+++ b/spec/migrations/migrate_store_security_reports_sidekiq_queue_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200213220159_migrate_store_security_reports_sidekiq_queue.rb')
+
+describe MigrateStoreSecurityReportsSidekiqQueue, :redis do
+  include Gitlab::Database::MigrationHelpers
+  include StubWorker
+
+  context 'when there are jobs in the queue' do
+    it 'migrates queue when migrating up' do
+      Sidekiq::Testing.disable! do
+        stub_worker(queue: 'pipeline_default:store_security_reports').perform_async(1, 5)
+
+        described_class.new.up
+
+        expect(sidekiq_queue_length('pipeline_default:store_security_reports')).to eq 0
+        expect(sidekiq_queue_length('security_scans:store_security_reports')).to eq 1
+      end
+    end
+
+    it 'migrates queue when migrating down' do
+      Sidekiq::Testing.disable! do
+        stub_worker(queue: 'security_scans:store_security_reports').perform_async(1, 5)
+
+        described_class.new.down
+
+        expect(sidekiq_queue_length('pipeline_default:store_security_reports')).to eq 1
+        expect(sidekiq_queue_length('security_scans:store_security_reports')).to eq 0
+      end
+    end
+  end
+end
diff --git a/spec/migrations/migrate_sync_security_reports_to_report_approval_rules_sidekiq_queue_spec.rb b/spec/migrations/migrate_sync_security_reports_to_report_approval_rules_sidekiq_queue_spec.rb
new file mode 100644
index 00000000000..6dfaff06ddb
--- /dev/null
+++ b/spec/migrations/migrate_sync_security_reports_to_report_approval_rules_sidekiq_queue_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200213220211_migrate_sync_security_reports_to_report_approval_rules_sidekiq_queue.rb')
+
+describe MigrateSyncSecurityReportsToReportApprovalRulesSidekiqQueue, :redis do
+  include Gitlab::Database::MigrationHelpers
+  include StubWorker
+
+  context 'when there are jobs in the queue' do
+    it 'migrates queue when migrating up' do
+      Sidekiq::Testing.disable! do
+        stub_worker(queue: 'pipeline_default:sync_security_reports_to_report_approval_rules').perform_async(1, 5)
+
+        described_class.new.up
+
+        expect(sidekiq_queue_length('pipeline_default:sync_security_reports_to_report_approval_rules')).to eq 0
+        expect(sidekiq_queue_length('security_scans:sync_security_reports_to_report_approval_rules')).to eq 1
+      end
+    end
+
+    it 'migrates queue when migrating down' do
+      Sidekiq::Testing.disable! do
+        stub_worker(queue: 'security_scans:sync_security_reports_to_report_approval_rules').perform_async(1, 5)
+
+        described_class.new.down
+
+        expect(sidekiq_queue_length('pipeline_default:sync_security_reports_to_report_approval_rules')).to eq 1
+        expect(sidekiq_queue_length('security_scans:sync_security_reports_to_report_approval_rules')).to eq 0
+      end
+    end
+  end
+end