diff options
author | Felipe Artur <felipefac@gmail.com> | 2017-09-12 18:07:11 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2017-09-12 18:10:34 -0300 |
commit | 056c42cca5aa21fb2ebc9e5fc2cbedf18cf8dbbc (patch) | |
tree | 48d9c42e8f56d1588be49d787f9b99aa43ff23c3 /spec/services | |
parent | de14e9c20392c4edfb9ee05f8a3364d7510a4f99 (diff) | |
download | gitlab-ce-056c42cca5aa21fb2ebc9e5fc2cbedf18cf8dbbc.tar.gz |
Fix project feature being deleted when updating project with invalid visibility level
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/projects/update_service_spec.rb | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index 92cc9a37795..371b0abf937 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -57,6 +57,21 @@ describe Projects::UpdateService, '#execute' do end end end + + context 'When project visibility is higher than parent group' do + let(:group) { create(:group, visibility_level: Gitlab::VisibilityLevel::INTERNAL) } + + before do + project.update(namespace: group, visibility_level: group.visibility_level) + end + + it 'does not update project visibility level' do + result = update_project(project, admin, visibility_level: Gitlab::VisibilityLevel::PUBLIC) + + expect(result).to eq({ status: :error, message: 'Visibility level public is not allowed in a internal group.' }) + expect(project.reload).to be_internal + end + end end describe 'when updating project that has forks' do @@ -159,8 +174,10 @@ describe Projects::UpdateService, '#execute' 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: "Name can contain only letters, digits, emojis, '_', '.', dash, space. It must start with letter, digit, emoji or '_'." + }) end end |