Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/models/bulk_imports/file_transfer/project_config_spec.rb b/spec/models/bulk_imports/file_transfer/project_config_spec.rb
index 0f02c5c546f..21fe6cfb3fa 100644
--- a/spec/models/bulk_imports/file_transfer/project_config_spec.rb
+++ b/spec/models/bulk_imports/file_transfer/project_config_spec.rb
@@ -42,6 +42,18 @@ RSpec.describe BulkImports::FileTransfer::ProjectConfig do
     it 'returns relation tree of a top level relation' do
       expect(subject.top_relation_tree('labels')).to eq('priorities' => {})
     end
+
+    it 'returns relation tree with merged with deprecated tree' do
+      expect(subject.top_relation_tree('ci_pipelines')).to match(
+        a_hash_including(
+          {
+            'external_pull_request' => {},
+            'merge_request' => {},
+            'stages' => { 'bridges' => {}, 'builds' => {}, 'generic_commit_statuses' => {}, 'statuses' => {} }
+          }
+        )
+      )
+    end
   end
 
   describe '#relation_excluded_keys' do