diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-29 18:42:23 +0000 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-29 18:42:23 +0000 |
commit | b41fe9bd6a9e410c63aeb20806bad99e37a3ec65 (patch) | |
tree | 36f85e2865fc334038c6ba7035c379629bb6593d /spec/requests/api | |
parent | 33f4f161a1a417c17fc4c6d18e4dc01c33945ab5 (diff) | |
parent | 739029bb0f03ff2bf70d67b3d2a09ddd196143a6 (diff) | |
download | gitlab-ce-b41fe9bd6a9e410c63aeb20806bad99e37a3ec65.tar.gz |
Merge branch 'security-dm-delete-deploy-key' into 'master'
[master] Fix API to remove deploy key from project instead of deleting it entirely
See merge request gitlab/gitlabhq!2379
Diffstat (limited to 'spec/requests/api')
-rw-r--r-- | spec/requests/api/deploy_keys_spec.rb | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/spec/requests/api/deploy_keys_spec.rb b/spec/requests/api/deploy_keys_spec.rb index ae9c0e9c304..32fc704a79b 100644 --- a/spec/requests/api/deploy_keys_spec.rb +++ b/spec/requests/api/deploy_keys_spec.rb @@ -171,7 +171,7 @@ describe API::DeployKeys do deploy_key end - it 'deletes existing key' do + it 'removes existing key from project' do expect do delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin) @@ -179,6 +179,44 @@ describe API::DeployKeys do end.to change { project.deploy_keys.count }.by(-1) end + context 'when the deploy key is public' do + it 'does not delete the deploy key' do + expect do + delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin) + + expect(response).to have_gitlab_http_status(204) + end.not_to change { DeployKey.count } + end + end + + context 'when the deploy key is not public' do + let!(:deploy_key) { create(:deploy_key, public: false) } + + context 'when the deploy key is only used by this project' do + it 'deletes the deploy key' do + expect do + delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin) + + expect(response).to have_gitlab_http_status(204) + end.to change { DeployKey.count }.by(-1) + end + end + + context 'when the deploy key is used by other projects' do + before do + create(:deploy_keys_project, project: project2, deploy_key: deploy_key) + end + + it 'does not delete the deploy key' do + expect do + delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin) + + expect(response).to have_gitlab_http_status(204) + end.not_to change { DeployKey.count } + end + end + end + it 'returns 404 Not Found with invalid ID' do delete api("/projects/#{project.id}/deploy_keys/404", admin) |