diff options
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/database/rename_reserved_paths_migration/namespaces_spec.rb | 69 | ||||
-rw-r--r-- | spec/lib/gitlab/database/rename_reserved_paths_migration_spec.rb | 80 |
2 files changed, 103 insertions, 46 deletions
diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/namespaces_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/namespaces_spec.rb index ea31e373647..3e5f981c095 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration/namespaces_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/namespaces_spec.rb @@ -25,7 +25,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::Namespaces, :truncate d describe '#namespaces_for_paths' do context 'for wildcard namespaces' do it 'only returns child namespaces with the correct path' do - _root_namespace = create(:namespace, path: 'the-path') + _root_namespace = create(:namespace, path: 'THE-path') _other_path = create(:namespace, path: 'other', parent: create(:namespace)) @@ -33,13 +33,13 @@ describe Gitlab::Database::RenameReservedPathsMigration::Namespaces, :truncate d path: 'the-path', parent: create(:namespace)) - found_ids = subject.namespaces_for_paths(['the-path'], type: :wildcard). - pluck(:id) + found_ids = subject.namespaces_for_paths(['the-PATH'], type: :wildcard). + map(&:id) expect(found_ids).to contain_exactly(namespace.id) end end - context 'for top level namespaces' do + context 'for top levelnamespaces' do it 'only returns child namespaces with the correct path' do root_namespace = create(:namespace, path: 'the-path') _other_path = create(:namespace, path: 'other') @@ -48,7 +48,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::Namespaces, :truncate d parent: create(:namespace)) found_ids = subject.namespaces_for_paths(['the-path'], type: :top_level). - pluck(:id) + map(&:id) expect(found_ids).to contain_exactly(root_namespace.id) end end @@ -127,35 +127,15 @@ describe Gitlab::Database::RenameReservedPathsMigration::Namespaces, :truncate d end end - describe "#remove_last_ocurrence" do - it "removes only the last occurance of a string" do - input = "this/is/a-word-to-replace/namespace/with/a-word-to-replace" - - expect(subject.remove_last_occurrence(input, "a-word-to-replace")) - .to eq("this/is/a-word-to-replace/namespace/with/") - end - end - describe "#rename_namespace" do let(:namespace) { create(:namespace, path: 'the-path') } - it "renames namespaces called the-path" do - subject.rename_namespace(namespace) - - expect(namespace.reload.path).to eq("the-path0") - end - - it "renames the route to the namespace" do - subject.rename_namespace(namespace) - - expect(Namespace.find(namespace.id).full_path).to eq("the-path0") - end - it "renames the route for projects of the namespace" do - project = create(:project, path: "project-path", namespace: namespace) + it 'renames paths & routes for the namesapce' do + expect(subject).to receive(:rename_path_for_routable). + with(namespace). + and_call_original subject.rename_namespace(namespace) - - expect(project.route.reload.path).to eq("the-path0/project-path") end it "moves the the repository for a project in the namespace" do @@ -180,29 +160,26 @@ describe Gitlab::Database::RenameReservedPathsMigration::Namespaces, :truncate d subject.rename_namespace(namespace) end + end - context "the-path namespace -> subgroup -> the-path0 project" do - it "updates the route of the project correctly" do - subgroup = create(:group, path: "subgroup", parent: namespace) - project = create(:project, path: "the-path0", namespace: subgroup) + describe '#rename_namespaces' do + let!(:top_level_namespace) { create(:namespace, path: 'the-path') } + let!(:child_namespace) do + create(:namespace, path: 'the-path', parent: create(:namespace)) + end - subject.rename_namespace(namespace) + it 'renames top level namespaces the namespace' do + expect(subject).to receive(:rename_namespace). + with(migration_namespace(top_level_namespace)) - expect(project.route.reload.path).to eq("the-path0/subgroup/the-path0") - end + subject.rename_namespaces(['the-path'], type: :top_level) end - end - describe '#rename_namespaces' do - context 'top level namespaces' do - let!(:namespace) { create(:namespace, path: 'the-path') } + it 'renames child namespaces' do + expect(subject).to receive(:rename_namespace). + with(migration_namespace(child_namespace)) - it 'should rename the namespace' do - expect(subject).to receive(:rename_namespace). - with(migration_namespace(namespace)) - - subject.rename_namespaces(['the-path'], type: :top_level) - end + subject.rename_namespaces(['the-path'], type: :wildcard) end end end diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration_spec.rb index 8b4ab6703c6..8fc15c8f716 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration_spec.rb @@ -7,6 +7,10 @@ describe Gitlab::Database::RenameReservedPathsMigration do ) end + before do + allow(subject).to receive(:say) + end + describe '#rename_wildcard_paths' do it 'should rename namespaces' do expect(subject).to receive(:rename_namespaces). @@ -26,4 +30,80 @@ describe Gitlab::Database::RenameReservedPathsMigration do subject.rename_root_paths('the-path') end end + + describe "#remove_last_ocurrence" do + it "removes only the last occurance of a string" do + input = "this/is/a-word-to-replace/namespace/with/a-word-to-replace" + + expect(subject.remove_last_occurrence(input, "a-word-to-replace")) + .to eq("this/is/a-word-to-replace/namespace/with/") + end + end + + describe '#rename_path_for_routable' do + context 'for namespaces' do + let(:namespace) { create(:namespace, path: 'the-path') } + it "renames namespaces called the-path" do + subject.rename_path_for_routable(namespace) + + expect(namespace.reload.path).to eq("the-path0") + end + + it "renames the route to the namespace" do + subject.rename_path_for_routable(namespace) + + expect(Namespace.find(namespace.id).full_path).to eq("the-path0") + end + + it "renames the route for projects of the namespace" do + project = create(:project, path: "project-path", namespace: namespace) + + subject.rename_path_for_routable(namespace) + + expect(project.route.reload.path).to eq("the-path0/project-path") + end + + it 'returns the old & the new path' do + old_path, new_path = subject.rename_path_for_routable(namespace) + + expect(old_path).to eq('the-path') + expect(new_path).to eq('the-path0') + end + + context "the-path namespace -> subgroup -> the-path0 project" do + it "updates the route of the project correctly" do + subgroup = create(:group, path: "subgroup", parent: namespace) + project = create(:project, path: "the-path0", namespace: subgroup) + + subject.rename_path_for_routable(namespace) + + expect(project.route.reload.path).to eq("the-path0/subgroup/the-path0") + end + end + end + + context 'for projects' do + let(:parent) { create(:namespace, path: 'the-parent') } + let(:project) { create(:empty_project, path: 'the-path', namespace: parent) } + + it 'renames the project called `the-path`' do + subject.rename_path_for_routable(project) + + expect(project.reload.path).to eq('the-path0') + end + + it 'renames the route for the project' do + subject.rename_path_for_routable(project) + + expect(project.reload.route.path).to eq('the-parent/the-path0') + end + + it 'returns the old & new path' do + old_path, new_path = subject.rename_path_for_routable(project) + + expect(old_path).to eq('the-parent/the-path') + expect(new_path).to eq('the-parent/the-path0') + end + end + end end |