From 613208c360f9f091a9994be2db107a46270e5fe4 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Thu, 13 Jul 2017 15:32:31 +0200 Subject: Recover from renaming project that has container images --- spec/controllers/projects_controller_spec.rb | 42 ++++++++++++++++++++------- spec/models/project_spec.rb | 2 +- spec/services/projects/update_service_spec.rb | 5 ++-- 3 files changed, 35 insertions(+), 14 deletions(-) (limited to 'spec') diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index f96fe7ad5cb..2a3c382b82c 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -211,24 +211,44 @@ describe ProjectsController do let(:admin) { create(:admin) } let(:project) { create(:project, :repository) } - let(:new_path) { 'renamed_path' } - let(:project_params) { { path: new_path } } before do sign_in(admin) end - it "sets the repository to the right path after a rename" do - controller.instance_variable_set(:@project, project) + context 'when only renaming a project path' do + it "sets the repository to the right path after a rename" do + expect { update_project path: 'renamed_path' } + .to change { project.reload.path } - put :update, - namespace_id: project.namespace, - id: project.id, - project: project_params + expect(project.reload.path).to include 'renamed_path' + expect(assigns(:repository).path).to include project.reload.path + expect(response).to have_http_status(302) + end + end - expect(project.repository.path).to include(new_path) - expect(assigns(:repository).path).to eq(project.repository.path) - expect(response).to have_http_status(302) + context 'when project has container repositories with tags' do + before do + stub_container_registry_config(enabled: true) + stub_container_registry_tags(repository: /image/, tags: %w[rc1]) + create(:container_repository, project: project, name: :image) + end + + it 'does not allow to rename the project' do + expect { update_project path: 'renamed_path' } + .not_to change { project.reload.path } + + expect(project.reload.path).to_not include 'renamed_path' + expect(controller).to set_flash[:alert].to(/container registry tags/) + expect(response).to have_http_status(200) + end + end + + def update_project(**parameters) + put :update, + namespace_id: project.namespace.path, + id: project.path, + project: parameters end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index c4bc129dd37..e636250c37d 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1236,7 +1236,7 @@ describe Project, models: true do subject { project.rename_repo } - it { expect{subject}.to raise_error(Exception) } + it { expect{subject}.to raise_error(StandardError) } end end diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index 05b18fef061..c974d470ae4 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -40,7 +40,7 @@ describe Projects::UpdateService, services: true do it 'does not update the project to public' do result = update_project(project, user, visibility_level: Gitlab::VisibilityLevel::PUBLIC) - expect(result).to eq({ status: :error, message: 'Visibility level unallowed' }) + expect(result).to eq({ status: :error, message: 'New visibility level not allowed!' }) expect(project).to be_private end @@ -92,7 +92,8 @@ describe Projects::UpdateService, services: true do it 'returns an error result when record cannot be updated' do result = update_project(project, admin, { name: 'foo&bar' }) - expect(result).to eq({ status: :error, message: 'Project could not be updated' }) + expect(result).to eq({ status: :error, + message: 'Project could not be updated!' }) end def update_project(project, user, opts) -- cgit v1.2.1 From 14fbff00b59ad3aeff7d585039720bb5743b13da Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 14 Jul 2017 11:21:52 +0200 Subject: Add specs for changing default branch in a project --- spec/services/projects/update_service_spec.rb | 34 ++++++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'spec') diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index c974d470ae4..cdf61eb28cf 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -1,11 +1,14 @@ require 'spec_helper' -describe Projects::UpdateService, services: true do +describe Projects::UpdateService, '#execute', :services do let(:user) { create(:user) } let(:admin) { create(:admin) } - let(:project) { create(:empty_project, creator_id: user.id, namespace: user.namespace) } - describe 'update_by_user' do + let(:project) do + create(:empty_project, creator: user, namespace: user.namespace) + end + + context 'when changing visibility level' do context 'when visibility_level is INTERNAL' do it 'updates the project to internal' do result = update_project(project, user, visibility_level: Gitlab::VisibilityLevel::INTERNAL) @@ -55,12 +58,13 @@ describe Projects::UpdateService, services: true do end end - describe 'visibility_level' do + describe 'when updating project that has forks' do let(:project) { create(:empty_project, :internal) } let(:forked_project) { create(:forked_project_with_submodules, :internal) } before do - forked_project.build_forked_project_link(forked_to_project_id: forked_project.id, forked_from_project_id: project.id) + forked_project.build_forked_project_link(forked_to_project_id: forked_project.id, + forked_from_project_id: project.id) forked_project.save end @@ -89,11 +93,23 @@ describe Projects::UpdateService, services: true do end end - it 'returns an error result when record cannot be updated' do - result = update_project(project, admin, { name: 'foo&bar' }) + context 'when updating a default branch' do + let(:project) { create(:project, :repository) } + + it 'changes a default branch' do + update_project(project, admin, default_branch: 'feature') + + expect(Project.find(project.id).default_branch).to eq 'feature' + end + end + + context 'when passing invalid parameters' do + it 'returns an error result when record cannot be updated' do + result = update_project(project, admin, { name: 'foo&bar' }) - expect(result).to eq({ status: :error, - message: 'Project could not be updated!' }) + expect(result).to eq({ status: :error, + message: 'Project could not be updated!' }) + end end def update_project(project, user, opts) -- cgit v1.2.1 From 881bc45abb5999b771c1ef01faae2b4e65f7b410 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 14 Jul 2017 11:23:46 +0200 Subject: Fix rubocop offense in projects controller specs --- spec/controllers/projects_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 2a3c382b82c..61d285c29ae 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -238,7 +238,7 @@ describe ProjectsController do expect { update_project path: 'renamed_path' } .not_to change { project.reload.path } - expect(project.reload.path).to_not include 'renamed_path' + expect(project.reload.path).not_to include 'renamed_path' expect(controller).to set_flash[:alert].to(/container registry tags/) expect(response).to have_http_status(200) end -- cgit v1.2.1 From 418af1010aa65dfa38b53f4393b2ca6c1dc9cbfb Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 14 Jul 2017 11:27:50 +0200 Subject: Adds specs for renaming a project with container images --- spec/services/projects/update_service_spec.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'spec') diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index cdf61eb28cf..fd4011ad606 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -103,6 +103,21 @@ describe Projects::UpdateService, '#execute', :services do end end + context 'when renaming project that contains container images' do + before do + stub_container_registry_config(enabled: true) + stub_container_registry_tags(repository: /image/, tags: %w[rc1]) + create(:container_repository, project: project, name: :image) + end + + it 'does not allow to rename the project' do + result = update_project(project, admin, path: 'renamed') + + expect(result).to include(status: :error) + expect(result[:message]).to match(/contains container registry tags/) + end + end + context 'when passing invalid parameters' do it 'returns an error result when record cannot be updated' do result = update_project(project, admin, { name: 'foo&bar' }) -- cgit v1.2.1 From b4349fd33130cb4796e087826990930822efc049 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 14 Jul 2017 14:07:32 +0200 Subject: Remove one assertion from projects controller specs --- spec/controllers/projects_controller_spec.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'spec') diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 61d285c29ae..192cca45d99 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -221,8 +221,8 @@ describe ProjectsController do expect { update_project path: 'renamed_path' } .to change { project.reload.path } - expect(project.reload.path).to include 'renamed_path' - expect(assigns(:repository).path).to include project.reload.path + expect(project.path).to include 'renamed_path' + expect(assigns(:repository).path).to include project.path expect(response).to have_http_status(302) end end @@ -238,7 +238,6 @@ describe ProjectsController do expect { update_project path: 'renamed_path' } .not_to change { project.reload.path } - expect(project.reload.path).not_to include 'renamed_path' expect(controller).to set_flash[:alert].to(/container registry tags/) expect(response).to have_http_status(200) end -- cgit v1.2.1