Add latest changes from gitlab-org/gitlab@master

2 files changed, 122 insertions, 0 deletions

diff --git a/spec/migrations/fix_batched_migrations_old_format_job_arguments_spec.rb b/spec/migrations/fix_batched_migrations_old_format_job_arguments_spec.rb
new file mode 100644
index 00000000000..e15011d0dab
--- /dev/null
+++ b/spec/migrations/fix_batched_migrations_old_format_job_arguments_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+# rubocop:disable Style/WordArray
+RSpec.describe FixBatchedMigrationsOldFormatJobArguments do
+  let(:batched_background_migrations) { table(:batched_background_migrations) }
+
+  context 'when migrations with legacy job arguments exists' do
+    it 'updates job arguments to current format' do
+      legacy_events_migration = create_batched_migration('events', 'id', ['id', 'id_convert_to_bigint'])
+      legacy_push_event_payloads_migration = create_batched_migration('push_event_payloads', 'event_id', ['event_id', 'event_id_convert_to_bigint'])
+
+      migrate!
+
+      expect(legacy_events_migration.reload.job_arguments).to eq([['id'], ['id_convert_to_bigint']])
+      expect(legacy_push_event_payloads_migration.reload.job_arguments).to eq([['event_id'], ['event_id_convert_to_bigint']])
+    end
+  end
+
+  context 'when only migrations with current job arguments exists' do
+    it 'updates nothing' do
+      events_migration = create_batched_migration('events', 'id', [['id'], ['id_convert_to_bigint']])
+      push_event_payloads_migration = create_batched_migration('push_event_payloads', 'event_id', [['event_id'], ['event_id_convert_to_bigint']])
+
+      migrate!
+
+      expect(events_migration.reload.job_arguments).to eq([['id'], ['id_convert_to_bigint']])
+      expect(push_event_payloads_migration.reload.job_arguments).to eq([['event_id'], ['event_id_convert_to_bigint']])
+    end
+  end
+
+  context 'when migrations with both legacy and current job arguments exist' do
+    it 'updates nothing' do
+      legacy_events_migration = create_batched_migration('events', 'id', ['id', 'id_convert_to_bigint'])
+      events_migration = create_batched_migration('events', 'id', [['id'], ['id_convert_to_bigint']])
+      legacy_push_event_payloads_migration = create_batched_migration('push_event_payloads', 'event_id', ['event_id', 'event_id_convert_to_bigint'])
+      push_event_payloads_migration = create_batched_migration('push_event_payloads', 'event_id', [['event_id'], ['event_id_convert_to_bigint']])
+
+      migrate!
+
+      expect(legacy_events_migration.reload.job_arguments).to eq(['id', 'id_convert_to_bigint'])
+      expect(events_migration.reload.job_arguments).to eq([['id'], ['id_convert_to_bigint']])
+      expect(legacy_push_event_payloads_migration.reload.job_arguments).to eq(['event_id', 'event_id_convert_to_bigint'])
+      expect(push_event_payloads_migration.reload.job_arguments).to eq([['event_id'], ['event_id_convert_to_bigint']])
+    end
+  end
+
+  def create_batched_migration(table_name, column_name, job_arguments)
+    batched_background_migrations.create!(
+      max_value: 10,
+      batch_size: 10,
+      sub_batch_size: 10,
+      interval: 1,
+      job_class_name: 'CopyColumnUsingBackgroundMigrationJob',
+      table_name: table_name,
+      column_name: column_name,
+      job_arguments: job_arguments
+    )
+  end
+end
+# rubocop:enable Style/WordArray
diff --git a/spec/migrations/schedule_backfill_draft_status_on_merge_requests_spec.rb b/spec/migrations/schedule_backfill_draft_status_on_merge_requests_spec.rb
new file mode 100644
index 00000000000..5a1c07d810f
--- /dev/null
+++ b/spec/migrations/schedule_backfill_draft_status_on_merge_requests_spec.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require_migration!
+
+RSpec.describe ScheduleBackfillDraftStatusOnMergeRequests, :sidekiq do
+  let(:namespaces)     { table(:namespaces) }
+  let(:projects)       { table(:projects) }
+  let(:merge_requests) { table(:merge_requests) }
+
+  let(:group)   { namespaces.create!(name: 'gitlab', path: 'gitlab') }
+  let(:project) { projects.create!(namespace_id: group.id) }
+
+  let(:draft_prefixes) { ["[Draft]", "(Draft)", "Draft:", "Draft", "[WIP]", "WIP:", "WIP"] }
+
+  def create_merge_request(params)
+    common_params = {
+      target_project_id: project.id,
+      target_branch: 'feature1',
+      source_branch: 'master'
+    }
+
+    merge_requests.create!(common_params.merge(params))
+  end
+
+  before do
+    draft_prefixes.each do |prefix|
+      (1..4).each do |n|
+        create_merge_request(
+          title: "#{prefix} This is a title",
+          draft: false,
+          state_id: n
+        )
+      end
+    end
+
+    stub_const("#{described_class}::BATCH_SIZE", 1)
+  end
+
+  it 'schedules BackfillDraftStatusOnMergeRequests background jobs' do
+    Sidekiq::Testing.fake! do
+      draft_mrs = Gitlab::BackgroundMigration::BackfillDraftStatusOnMergeRequests::MergeRequest.eligible
+
+      first_mr_id = draft_mrs.first.id
+      second_mr_id = draft_mrs.second.id
+
+      freeze_time do
+        migrate!
+
+        expect(BackgroundMigrationWorker.jobs.size).to eq(7)
+        expect(described_class::MIGRATION)
+          .to be_scheduled_delayed_migration(2.minutes, first_mr_id, first_mr_id)
+        expect(described_class::MIGRATION)
+          .to be_scheduled_delayed_migration(4.minutes, second_mr_id, second_mr_id)
+      end
+    end
+  end
+end