Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 17 insertions, 7 deletions

diff --git a/spec/lib/gitlab/background_migration/backfill_work_item_type_id_for_issues_spec.rb b/spec/lib/gitlab/background_migration/backfill_work_item_type_id_for_issues_spec.rb
index 8d82c533d20..6ef474ad7f9 100644
--- a/spec/lib/gitlab/background_migration/backfill_work_item_type_id_for_issues_spec.rb
+++ b/spec/lib/gitlab/background_migration/backfill_work_item_type_id_for_issues_spec.rb
@@ -2,12 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::BackgroundMigration::BackfillWorkItemTypeIdForIssues, :migration, schema: 20220326161803 do
-  subject(:migrate) { migration.perform(start_id, end_id, batch_table, batch_column, sub_batch_size, pause_ms, issue_type_enum[:issue], issue_type.id) }
-
-  let(:migration) { described_class.new }
-
-  let(:batch_table) { 'issues' }
+RSpec.describe Gitlab::BackgroundMigration::BackfillWorkItemTypeIdForIssues, :migration, schema: 20220825142324 do
   let(:batch_column) { 'id' }
   let(:sub_batch_size) { 2 }
   let(:pause_ms) { 0 }
@@ -15,7 +10,7 @@ RSpec.describe Gitlab::BackgroundMigration::BackfillWorkItemTypeIdForIssues, :mi
   # let_it_be can't be used in migration specs because all tables but `work_item_types` are deleted after each spec
   let(:issue_type_enum) { { issue: 0, incident: 1, test_case: 2, requirement: 3, task: 4 } }
   let(:namespace) { table(:namespaces).create!(name: 'namespace', path: 'namespace') }
-  let(:project) { table(:projects).create!(namespace_id: namespace.id) }
+  let(:project) { table(:projects).create!(namespace_id: namespace.id, project_namespace_id: namespace.id) }
   let(:issues_table) { table(:issues) }
   let(:issue_type) { table(:work_item_types).find_by!(namespace_id: nil, base_type: issue_type_enum[:issue]) }
 
@@ -32,6 +27,21 @@ RSpec.describe Gitlab::BackgroundMigration::BackfillWorkItemTypeIdForIssues, :mi
 
   let(:all_issues) { [issue1, issue2, issue3, incident1, test_case1, requirement1] }
 
+  let(:migration) do
+    described_class.new(
+      start_id: start_id,
+      end_id: end_id,
+      batch_table: :issues,
+      batch_column: :id,
+      sub_batch_size: sub_batch_size,
+      pause_ms: pause_ms,
+      job_arguments: [issue_type_enum[:issue], issue_type.id],
+      connection: ApplicationRecord.connection
+    )
+  end
+
+  subject(:migrate) { migration.perform }
+
   it 'sets work_item_type_id only for the given type' do
     expect(all_issues).to all(have_attributes(work_item_type_id: nil))