diff options
Diffstat (limited to 'spec/lib/gitlab/import_export')
-rw-r--r-- | spec/lib/gitlab/import_export/base/object_builder_spec.rb (renamed from spec/lib/gitlab/import_export/base_object_builder_spec.rb) | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/base/relation_factory_spec.rb (renamed from spec/lib/gitlab/import_export/base_relation_factory_spec.rb) | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/fork_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/group/object_builder_spec.rb (renamed from spec/lib/gitlab/import_export/group_object_builder_spec.rb) | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/group/relation_factory_spec.rb (renamed from spec/lib/gitlab/import_export/group_relation_factory_spec.rb) | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/group/tree_restorer_spec.rb (renamed from spec/lib/gitlab/import_export/group_tree_restorer_spec.rb) | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/group/tree_saver_spec.rb (renamed from spec/lib/gitlab/import_export/group_tree_saver_spec.rb) | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/importer_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/project/object_builder_spec.rb (renamed from spec/lib/gitlab/import_export/group_project_object_builder_spec.rb) | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/project/relation_factory_spec.rb (renamed from spec/lib/gitlab/import_export/project_relation_factory_spec.rb) | 8 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/project/tree_loader_spec.rb (renamed from spec/lib/gitlab/import_export/project_tree_loader_spec.rb) | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/project/tree_restorer_spec.rb (renamed from spec/lib/gitlab/import_export/project_tree_restorer_spec.rb) | 3 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/project/tree_saver_spec.rb (renamed from spec/lib/gitlab/import_export/project_tree_saver_spec.rb) | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/relation_rename_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/relation_tree_restorer_spec.rb | 4 |
15 files changed, 26 insertions, 27 deletions
diff --git a/spec/lib/gitlab/import_export/base_object_builder_spec.rb b/spec/lib/gitlab/import_export/base/object_builder_spec.rb index fbb3b08cf56..e5242ae0bfc 100644 --- a/spec/lib/gitlab/import_export/base_object_builder_spec.rb +++ b/spec/lib/gitlab/import_export/base/object_builder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::BaseObjectBuilder do +describe Gitlab::ImportExport::Base::ObjectBuilder do let(:project) do create(:project, :repository, :builds_disabled, @@ -11,7 +11,7 @@ describe Gitlab::ImportExport::BaseObjectBuilder do path: 'project') end let(:klass) { Milestone } - let(:attributes) { { 'title' => 'Test BaseObjectBuilder Milestone', 'project' => project } } + let(:attributes) { { 'title' => 'Test Base::ObjectBuilder Milestone', 'project' => project } } subject { described_class.build(klass, attributes) } diff --git a/spec/lib/gitlab/import_export/base_relation_factory_spec.rb b/spec/lib/gitlab/import_export/base/relation_factory_spec.rb index e02d8f3d2e6..1011de83c95 100644 --- a/spec/lib/gitlab/import_export/base_relation_factory_spec.rb +++ b/spec/lib/gitlab/import_export/base/relation_factory_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::BaseRelationFactory do +describe Gitlab::ImportExport::Base::RelationFactory do let(:user) { create(:admin) } let(:project) { create(:project) } let(:members_mapper) { double('members_mapper').as_null_object } @@ -13,7 +13,7 @@ describe Gitlab::ImportExport::BaseRelationFactory do subject do described_class.create(relation_sym: relation_sym, relation_hash: relation_hash, - object_builder: Gitlab::ImportExport::GroupProjectObjectBuilder, + object_builder: Gitlab::ImportExport::Project::ObjectBuilder, members_mapper: members_mapper, user: user, importable: project, diff --git a/spec/lib/gitlab/import_export/fork_spec.rb b/spec/lib/gitlab/import_export/fork_spec.rb index 09e4f62c686..8aa28353c04 100644 --- a/spec/lib/gitlab/import_export/fork_spec.rb +++ b/spec/lib/gitlab/import_export/fork_spec.rb @@ -24,11 +24,11 @@ describe 'forked project import' do end let(:saver) do - Gitlab::ImportExport::ProjectTreeSaver.new(project: project_with_repo, current_user: user, shared: shared) + Gitlab::ImportExport::Project::TreeSaver.new(project: project_with_repo, current_user: user, shared: shared) end let(:restorer) do - Gitlab::ImportExport::ProjectTreeRestorer.new(user: user, shared: shared, project: project) + Gitlab::ImportExport::Project::TreeRestorer.new(user: user, shared: shared, project: project) end before do diff --git a/spec/lib/gitlab/import_export/group_object_builder_spec.rb b/spec/lib/gitlab/import_export/group/object_builder_spec.rb index 08b2dae1147..781670b0aa5 100644 --- a/spec/lib/gitlab/import_export/group_object_builder_spec.rb +++ b/spec/lib/gitlab/import_export/group/object_builder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::GroupObjectBuilder do +describe Gitlab::ImportExport::Group::ObjectBuilder do let(:group) { create(:group) } let(:base_attributes) do { diff --git a/spec/lib/gitlab/import_export/group_relation_factory_spec.rb b/spec/lib/gitlab/import_export/group/relation_factory_spec.rb index 9208b2ad203..332648d5c89 100644 --- a/spec/lib/gitlab/import_export/group_relation_factory_spec.rb +++ b/spec/lib/gitlab/import_export/group/relation_factory_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::GroupRelationFactory do +describe Gitlab::ImportExport::Group::RelationFactory do let(:group) { create(:group) } let(:members_mapper) { double('members_mapper').as_null_object } let(:user) { create(:admin) } @@ -11,7 +11,7 @@ describe Gitlab::ImportExport::GroupRelationFactory do described_class.create(relation_sym: relation_sym, relation_hash: relation_hash, members_mapper: members_mapper, - object_builder: Gitlab::ImportExport::GroupObjectBuilder, + object_builder: Gitlab::ImportExport::Group::ObjectBuilder, user: user, importable: group, excluded_keys: excluded_keys) diff --git a/spec/lib/gitlab/import_export/group_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/group/tree_restorer_spec.rb index b2c8398d358..5584f1503f7 100644 --- a/spec/lib/gitlab/import_export/group_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/group/tree_restorer_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::GroupTreeRestorer do +describe Gitlab::ImportExport::Group::TreeRestorer do include ImportExport::CommonUtil let(:shared) { Gitlab::ImportExport::Shared.new(group) } diff --git a/spec/lib/gitlab/import_export/group_tree_saver_spec.rb b/spec/lib/gitlab/import_export/group/tree_saver_spec.rb index 7f49c7af8fa..845eb8e308b 100644 --- a/spec/lib/gitlab/import_export/group_tree_saver_spec.rb +++ b/spec/lib/gitlab/import_export/group/tree_saver_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::GroupTreeSaver do +describe Gitlab::ImportExport::Group::TreeSaver do describe 'saves the group tree into a json object' do let(:shared) { Gitlab::ImportExport::Shared.new(group) } let(:group_tree_saver) { described_class.new(group: group, current_user: user, shared: shared) } @@ -72,7 +72,7 @@ describe Gitlab::ImportExport::GroupTreeSaver do # except: # context 'with description override' do # context 'group members' do - # ^ These are specific for the groupTreeSaver + # ^ These are specific for the Group::TreeSaver context 'JSON' do let(:saved_group_json) do group_tree_saver.save diff --git a/spec/lib/gitlab/import_export/importer_spec.rb b/spec/lib/gitlab/import_export/importer_spec.rb index 942af4084e5..07857269004 100644 --- a/spec/lib/gitlab/import_export/importer_spec.rb +++ b/spec/lib/gitlab/import_export/importer_spec.rb @@ -63,7 +63,7 @@ describe Gitlab::ImportExport::Importer do end it 'restores the ProjectTree' do - expect(Gitlab::ImportExport::ProjectTreeRestorer).to receive(:new).and_call_original + expect(Gitlab::ImportExport::Project::TreeRestorer).to receive(:new).and_call_original importer.execute end diff --git a/spec/lib/gitlab/import_export/group_project_object_builder_spec.rb b/spec/lib/gitlab/import_export/project/object_builder_spec.rb index 34049cbf570..c9d1410400a 100644 --- a/spec/lib/gitlab/import_export/group_project_object_builder_spec.rb +++ b/spec/lib/gitlab/import_export/project/object_builder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::GroupProjectObjectBuilder do +describe Gitlab::ImportExport::Project::ObjectBuilder do let!(:group) { create(:group, :private) } let!(:subgroup) { create(:group, :private, parent: group) } let!(:project) do diff --git a/spec/lib/gitlab/import_export/project_relation_factory_spec.rb b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb index d0e89b2e57b..73ae6810706 100644 --- a/spec/lib/gitlab/import_export/project_relation_factory_spec.rb +++ b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::ProjectRelationFactory do +describe Gitlab::ImportExport::Project::RelationFactory do let(:group) { create(:group) } let(:project) { create(:project, :repository, group: group) } let(:members_mapper) { double('members_mapper').as_null_object } @@ -11,7 +11,7 @@ describe Gitlab::ImportExport::ProjectRelationFactory do let(:created_object) do described_class.create(relation_sym: relation_sym, relation_hash: relation_hash, - object_builder: Gitlab::ImportExport::GroupProjectObjectBuilder, + object_builder: Gitlab::ImportExport::Project::ObjectBuilder, members_mapper: members_mapper, user: user, importable: project, @@ -243,11 +243,11 @@ describe Gitlab::ImportExport::ProjectRelationFactory do context 'Project references' do let(:relation_sym) { :project_foo_model } let(:relation_hash) do - Gitlab::ImportExport::ProjectRelationFactory::PROJECT_REFERENCES.map { |ref| { ref => 99 } }.inject(:merge) + Gitlab::ImportExport::Project::RelationFactory::PROJECT_REFERENCES.map { |ref| { ref => 99 } }.inject(:merge) end class ProjectFooModel < FooModel - attr_accessor(*Gitlab::ImportExport::ProjectRelationFactory::PROJECT_REFERENCES) + attr_accessor(*Gitlab::ImportExport::Project::RelationFactory::PROJECT_REFERENCES) end before do diff --git a/spec/lib/gitlab/import_export/project_tree_loader_spec.rb b/spec/lib/gitlab/import_export/project/tree_loader_spec.rb index b22de5a3f7b..e683eefa7c0 100644 --- a/spec/lib/gitlab/import_export/project_tree_loader_spec.rb +++ b/spec/lib/gitlab/import_export/project/tree_loader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::ProjectTreeLoader do +describe Gitlab::ImportExport::Project::TreeLoader do let(:fixture) { 'spec/fixtures/lib/gitlab/import_export/with_duplicates.json' } let(:project_tree) { JSON.parse(File.read(fixture)) } diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb index c899217d164..312bbb58a28 100644 --- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb @@ -1,9 +1,8 @@ # frozen_string_literal: true require 'spec_helper' -include ImportExport::CommonUtil -describe Gitlab::ImportExport::ProjectTreeRestorer do +describe Gitlab::ImportExport::Project::TreeRestorer do include ImportExport::CommonUtil let(:shared) { project.import_export_shared } diff --git a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb b/spec/lib/gitlab/import_export/project/tree_saver_spec.rb index 126ac289a56..151fdf8810f 100644 --- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb +++ b/spec/lib/gitlab/import_export/project/tree_saver_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::ImportExport::ProjectTreeSaver do +describe Gitlab::ImportExport::Project::TreeSaver do describe 'saves the project tree into a json object' do let(:shared) { project.import_export_shared } let(:project_tree_saver) { described_class.new(project: project, current_user: user, shared: shared) } @@ -75,7 +75,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver do # except: # context 'with description override' do # context 'group members' do - # ^ These are specific for the ProjectTreeSaver + # ^ These are specific for the Project::TreeSaver context 'JSON' do let(:saved_project_json) do project_tree_saver.save diff --git a/spec/lib/gitlab/import_export/relation_rename_service_spec.rb b/spec/lib/gitlab/import_export/relation_rename_service_spec.rb index d62f5725f9e..2e251154e9f 100644 --- a/spec/lib/gitlab/import_export/relation_rename_service_spec.rb +++ b/spec/lib/gitlab/import_export/relation_rename_service_spec.rb @@ -22,7 +22,7 @@ describe Gitlab::ImportExport::RelationRenameService do end context 'when importing' do - let(:project_tree_restorer) { Gitlab::ImportExport::ProjectTreeRestorer.new(user: user, shared: shared, project: project) } + let(:project_tree_restorer) { Gitlab::ImportExport::Project::TreeRestorer.new(user: user, shared: shared, project: project) } let(:file_content) { IO.read(File.join(shared.export_path, 'project.json')) } let(:json_file) { ActiveSupport::JSON.decode(file_content) } @@ -99,7 +99,7 @@ describe Gitlab::ImportExport::RelationRenameService do let(:relation_tree_saver) { Gitlab::ImportExport::RelationTreeSaver.new } let(:project_tree_saver) do - Gitlab::ImportExport::ProjectTreeSaver.new( + Gitlab::ImportExport::Project::TreeSaver.new( project: project, current_user: user, shared: shared) end diff --git a/spec/lib/gitlab/import_export/relation_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/relation_tree_restorer_spec.rb index edb2c0a131a..80901feb893 100644 --- a/spec/lib/gitlab/import_export/relation_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/relation_tree_restorer_spec.rb @@ -39,8 +39,8 @@ describe Gitlab::ImportExport::RelationTreeRestorer do context 'when restoring a project' do let(:path) { 'spec/fixtures/lib/gitlab/import_export/complex/project.json' } let(:importable) { create(:project, :builds_enabled, :issues_disabled, name: 'project', path: 'project') } - let(:object_builder) { Gitlab::ImportExport::GroupProjectObjectBuilder } - let(:relation_factory) { Gitlab::ImportExport::ProjectRelationFactory } + let(:object_builder) { Gitlab::ImportExport::Project::ObjectBuilder } + let(:relation_factory) { Gitlab::ImportExport::Project::RelationFactory } let(:reader) { Gitlab::ImportExport::Reader.new(shared: shared) } let(:tree_hash) { importable_hash } |