Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 19 insertions, 6 deletions

diff --git a/spec/lib/gitlab/background_migration/merge_topics_with_same_name_spec.rb b/spec/lib/gitlab/background_migration/merge_topics_with_same_name_spec.rb
index 254b4fea698..2c2c048992f 100644
--- a/spec/lib/gitlab/background_migration/merge_topics_with_same_name_spec.rb
+++ b/spec/lib/gitlab/background_migration/merge_topics_with_same_name_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::BackgroundMigration::MergeTopicsWithSameName, schema: 20220223124428 do
+RSpec.describe Gitlab::BackgroundMigration::MergeTopicsWithSameName, schema: 20220331133802 do
   def set_avatar(topic_id, avatar)
     topic = ::Projects::Topic.find(topic_id)
     topic.avatar = avatar
@@ -16,49 +16,62 @@ RSpec.describe Gitlab::BackgroundMigration::MergeTopicsWithSameName, schema: 202
     topics = table(:topics)
     project_topics = table(:project_topics)
 
-    group = namespaces.create!(name: 'group', path: 'group')
-    project_1 = projects.create!(namespace_id: group.id, visibility_level: 20)
-    project_2 = projects.create!(namespace_id: group.id, visibility_level: 10)
-    project_3 = projects.create!(namespace_id: group.id, visibility_level: 0)
+    group_1 = namespaces.create!(name: 'space1', type: 'Group', path: 'space1')
+    group_2 = namespaces.create!(name: 'space2', type: 'Group', path: 'space2')
+    group_3 = namespaces.create!(name: 'space3', type: 'Group', path: 'space3')
+    proj_space_1 = namespaces.create!(name: 'proj1', path: 'proj1', type: 'Project', parent_id: group_1.id)
+    proj_space_2 = namespaces.create!(name: 'proj2', path: 'proj2', type: 'Project', parent_id: group_2.id)
+    proj_space_3 = namespaces.create!(name: 'proj3', path: 'proj3', type: 'Project', parent_id: group_3.id)
+    project_1 = projects.create!(namespace_id: group_1.id, project_namespace_id: proj_space_1.id, visibility_level: 20)
+    project_2 = projects.create!(namespace_id: group_2.id, project_namespace_id: proj_space_2.id, visibility_level: 10)
+    project_3 = projects.create!(namespace_id: group_3.id, project_namespace_id: proj_space_3.id, visibility_level: 0)
     topic_1_keep = topics.create!(
       name: 'topic1',
+      title: 'Topic 1',
       description: 'description 1 to keep',
       total_projects_count: 2,
       non_private_projects_count: 2
     )
     topic_1_remove = topics.create!(
       name: 'TOPIC1',
+      title: 'Topic 1',
       description: 'description 1 to remove',
       total_projects_count: 2,
       non_private_projects_count: 1
     )
     topic_2_remove = topics.create!(
       name: 'topic2',
+      title: 'Topic 2',
       total_projects_count: 0
     )
     topic_2_keep = topics.create!(
       name: 'TOPIC2',
+      title: 'Topic 2',
       description: 'description 2 to keep',
       total_projects_count: 1
     )
     topic_3_remove_1 = topics.create!(
       name: 'topic3',
+      title: 'Topic 3',
       total_projects_count: 2,
       non_private_projects_count: 1
     )
     topic_3_keep = topics.create!(
       name: 'Topic3',
+      title: 'Topic 3',
       total_projects_count: 2,
       non_private_projects_count: 2
     )
     topic_3_remove_2 = topics.create!(
       name: 'TOPIC3',
+      title: 'Topic 3',
       description: 'description 3 to keep',
       total_projects_count: 2,
       non_private_projects_count: 1
     )
     topic_4_keep = topics.create!(
-      name: 'topic4'
+      name: 'topic4',
+      title: 'Topic 4'
     )
 
     project_topics_1 = []