1 files changed, 27 insertions, 78 deletions
diff --git a/spec/lib/gitlab/import_export/reader_spec.rb b/spec/lib/gitlab/import_export/reader_spec.rb
index f93ff074770..87f665bd995 100644
--- a/spec/lib/gitlab/import_export/reader_spec.rb
+++ b/spec/lib/gitlab/import_export/reader_spec.rb
@@ -2,96 +2,45 @@ require 'spec_helper'
 
 describe Gitlab::ImportExport::Reader do
   let(:shared) { Gitlab::ImportExport::Shared.new(nil) }
-  let(:test_config) { 'spec/support/import_export/import_export.yml' }
-  let(:project_tree_hash) do
-    {
-      except: [:id, :created_at],
-      include: [:issues, :labels,
-                { merge_requests: {
-                  only: [:id],
-                  except: [:iid],
-                  include: [:merge_request_diff, :merge_request_test]
-                } },
-                { commit_statuses: { include: :commit } },
-                { project_members: { include: { user: { only: [:email] } } } }]
-    }
-  end
-
-  before do
-    allow_any_instance_of(Gitlab::ImportExport).to receive(:config_file).and_return(test_config)
-  end
-
-  it 'generates hash from project tree config' do
-    expect(described_class.new(shared: shared).project_tree).to match(project_tree_hash)
-  end
-
-  context 'individual scenarios' do
-    it 'generates the correct hash for a single project relation' do
-      setup_yaml(project_tree: [:issues])
-
-      expect(described_class.new(shared: shared).project_tree).to match(include: [:issues])
-    end
-
-    it 'generates the correct hash for a single project feature relation' do
-      setup_yaml(project_tree: [:project_feature])
 
-      expect(described_class.new(shared: shared).project_tree).to match(include: [:project_feature])
-    end
+  describe '#project_tree' do
+    subject { described_class.new(shared: shared).project_tree }
 
-    it 'generates the correct hash for a multiple project relation' do
-      setup_yaml(project_tree: [:issues, :snippets])
+    it 'delegates to AttributesFinder#find_root' do
+      expect_any_instance_of(Gitlab::ImportExport::AttributesFinder)
+        .to receive(:find_root)
+        .with(:project)
 
-      expect(described_class.new(shared: shared).project_tree).to match(include: [:issues, :snippets])
+      subject
     end
 
-    it 'generates the correct hash for a single sub-relation' do
-      setup_yaml(project_tree: [issues: [:notes]])
+    context 'when exception raised' do
+      before do
+        expect_any_instance_of(Gitlab::ImportExport::AttributesFinder)
+          .to receive(:find_root)
+          .with(:project)
+          .and_raise(StandardError)
+      end
 
-      expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { include: :notes } }])
-    end
-
-    it 'generates the correct hash for a multiple sub-relation' do
-      setup_yaml(project_tree: [merge_requests: [:notes, :merge_request_diff]])
-
-      expect(described_class.new(shared: shared).project_tree).to match(include: [{ merge_requests: { include: [:notes, :merge_request_diff] } }])
-    end
+      it { is_expected.to be false }
 
-    it 'generates the correct hash for a sub-relation with another sub-relation' do
-      setup_yaml(project_tree: [merge_requests: [notes: :author]])
+      it 'logs the error' do
+        expect(shared).to receive(:error).with(instance_of(StandardError))
 
-      expect(described_class.new(shared: shared).project_tree).to match(include: [{ merge_requests: { include: { notes: { include: :author } } } }])
+        subject
+      end
     end
+  end
 
-    it 'generates the correct hash for a relation with included attributes' do
-      setup_yaml(project_tree: [:issues], included_attributes: { issues: [:name, :description] })
-
-      expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { only: [:name, :description] } }])
-    end
-
-    it 'generates the correct hash for a relation with excluded attributes' do
-      setup_yaml(project_tree: [:issues], excluded_attributes: { issues: [:name] })
-
-      expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { except: [:name] } }])
-    end
-
-    it 'generates the correct hash for a relation with both excluded and included attributes' do
-      setup_yaml(project_tree: [:issues], excluded_attributes: { issues: [:name] }, included_attributes: { issues: [:description] })
-
-      expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { except: [:name], only: [:description] } }])
-    end
-
-    it 'generates the correct hash for a relation with custom methods' do
-      setup_yaml(project_tree: [:issues], methods: { issues: [:name] })
-
-      expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { methods: [:name] } }])
-    end
+  describe '#group_members_tree' do
+    subject { described_class.new(shared: shared).group_members_tree }
 
-    it 'generates the correct hash for group members' do
-      expect(described_class.new(shared: shared).group_members_tree).to match({ include: { user: { only: [:email] } } })
-    end
+    it 'delegates to AttributesFinder#find_root' do
+      expect_any_instance_of(Gitlab::ImportExport::AttributesFinder)
+        .to receive(:find_root)
+        .with(:group_members)
 
-    def setup_yaml(hash)
-      allow(YAML).to receive(:load_file).with(test_config).and_return(hash)
+      subject
     end
   end
 end