modify api to work with new deploy keys
This commit is contained in:
parent
1882baa1aa
commit
4528fa9817
|
@ -25,8 +25,8 @@ module Gitlab
|
||||||
return false unless project
|
return false unless project
|
||||||
|
|
||||||
|
|
||||||
if key.is_deploy_key
|
if key.is_a? DeployKey
|
||||||
project == key.project && git_cmd == 'git-upload-pack'
|
key.projects.include?(project) && git_cmd == 'git-upload-pack'
|
||||||
else
|
else
|
||||||
user = key.user
|
user = key.user
|
||||||
|
|
||||||
|
|
|
@ -531,8 +531,8 @@ module Gitlab
|
||||||
# POST /projects/:id/keys
|
# POST /projects/:id/keys
|
||||||
post ":id/keys" do
|
post ":id/keys" do
|
||||||
attrs = attributes_for_keys [:title, :key]
|
attrs = attributes_for_keys [:title, :key]
|
||||||
key = user_project.deploy_keys.new attrs
|
key = DeployKey.new attrs
|
||||||
if key.save
|
if key.valid? && user_project.deploy_keys << key
|
||||||
present key, with: Entities::SSHKey
|
present key, with: Entities::SSHKey
|
||||||
else
|
else
|
||||||
not_found!
|
not_found!
|
||||||
|
@ -545,9 +545,8 @@ module Gitlab
|
||||||
# DELETE /projects/:id/keys/:id
|
# DELETE /projects/:id/keys/:id
|
||||||
delete ":id/keys/:key_id" do
|
delete ":id/keys/:key_id" do
|
||||||
key = user_project.deploy_keys.find params[:key_id]
|
key = user_project.deploy_keys.find params[:key_id]
|
||||||
key.delete
|
key.destroy
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -174,7 +174,7 @@ module Gitlab
|
||||||
delete "keys/:id" do
|
delete "keys/:id" do
|
||||||
begin
|
begin
|
||||||
key = current_user.keys.find params[:id]
|
key = current_user.keys.find params[:id]
|
||||||
key.delete
|
key.destroy
|
||||||
rescue
|
rescue
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -37,7 +37,8 @@ describe Project do
|
||||||
it { should have_many(:users_projects).dependent(:destroy) }
|
it { should have_many(:users_projects).dependent(:destroy) }
|
||||||
it { should have_many(:notes).dependent(:destroy) }
|
it { should have_many(:notes).dependent(:destroy) }
|
||||||
it { should have_many(:snippets).dependent(:destroy) }
|
it { should have_many(:snippets).dependent(:destroy) }
|
||||||
it { should have_many(:deploy_keys).dependent(:destroy) }
|
it { should have_many(:deploy_keys_projects).dependent(:destroy) }
|
||||||
|
it { should have_many(:deploy_keys) }
|
||||||
it { should have_many(:hooks).dependent(:destroy) }
|
it { should have_many(:hooks).dependent(:destroy) }
|
||||||
it { should have_many(:protected_branches).dependent(:destroy) }
|
it { should have_many(:protected_branches).dependent(:destroy) }
|
||||||
it { should have_one(:forked_project_link).dependent(:destroy) }
|
it { should have_one(:forked_project_link).dependent(:destroy) }
|
||||||
|
|
|
@ -13,7 +13,6 @@ describe Gitlab::API do
|
||||||
let!(:snippet) { create(:snippet, author: user, project: project, title: 'example') }
|
let!(:snippet) { create(:snippet, author: user, project: project, title: 'example') }
|
||||||
let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
|
let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
|
||||||
let!(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
|
let!(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
|
||||||
let(:key) { create(:key, project: project) }
|
|
||||||
|
|
||||||
before { project.team << [user, :reporter] }
|
before { project.team << [user, :reporter] }
|
||||||
|
|
||||||
|
@ -636,58 +635,61 @@ describe Gitlab::API do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "GET /projects/:id/keys" do
|
describe :deploy_keys do
|
||||||
it "should return array of ssh keys" do
|
let(:deploy_keys_project) { create(:deploy_keys_project, project: project) }
|
||||||
project.deploy_keys << key
|
let(:deploy_key) { deploy_keys_project.deploy_key }
|
||||||
project.save
|
|
||||||
get api("/projects/#{project.id}/keys", user)
|
|
||||||
response.status.should == 200
|
|
||||||
json_response.should be_an Array
|
|
||||||
json_response.first['title'].should == key.title
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "GET /projects/:id/keys/:key_id" do
|
describe "GET /projects/:id/keys" do
|
||||||
it "should return a single key" do
|
before { deploy_key }
|
||||||
project.deploy_keys << key
|
|
||||||
project.save
|
it "should return array of ssh keys" do
|
||||||
get api("/projects/#{project.id}/keys/#{key.id}", user)
|
get api("/projects/#{project.id}/keys", user)
|
||||||
response.status.should == 200
|
response.status.should == 200
|
||||||
json_response['title'].should == key.title
|
json_response.should be_an Array
|
||||||
|
json_response.first['title'].should == deploy_key.title
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should return 404 Not Found with invalid ID" do
|
describe "GET /projects/:id/keys/:key_id" do
|
||||||
get api("/projects/#{project.id}/keys/404", user)
|
it "should return a single key" do
|
||||||
response.status.should == 404
|
get api("/projects/#{project.id}/keys/#{deploy_key.id}", user)
|
||||||
end
|
response.status.should == 200
|
||||||
end
|
json_response['title'].should == deploy_key.title
|
||||||
|
end
|
||||||
|
|
||||||
describe "POST /projects/:id/keys" do
|
it "should return 404 Not Found with invalid ID" do
|
||||||
it "should not create an invalid ssh key" do
|
get api("/projects/#{project.id}/keys/404", user)
|
||||||
post api("/projects/#{project.id}/keys", user), { title: "invalid key" }
|
response.status.should == 404
|
||||||
response.status.should == 404
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should create new ssh key" do
|
describe "POST /projects/:id/keys" do
|
||||||
key_attrs = attributes_for :key
|
it "should not create an invalid ssh key" do
|
||||||
expect {
|
post api("/projects/#{project.id}/keys", user), { title: "invalid key" }
|
||||||
post api("/projects/#{project.id}/keys", user), key_attrs
|
response.status.should == 404
|
||||||
}.to change{ project.deploy_keys.count }.by(1)
|
end
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "DELETE /projects/:id/keys/:key_id" do
|
it "should create new ssh key" do
|
||||||
it "should delete existing key" do
|
key_attrs = attributes_for :key
|
||||||
project.deploy_keys << key
|
expect {
|
||||||
project.save
|
post api("/projects/#{project.id}/keys", user), key_attrs
|
||||||
expect {
|
}.to change{ project.deploy_keys.count }.by(1)
|
||||||
delete api("/projects/#{project.id}/keys/#{key.id}", user)
|
end
|
||||||
}.to change{ project.deploy_keys.count }.by(-1)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should return 404 Not Found with invalid ID" do
|
describe "DELETE /projects/:id/keys/:key_id" do
|
||||||
delete api("/projects/#{project.id}/keys/404", user)
|
before { deploy_key }
|
||||||
response.status.should == 404
|
|
||||||
|
it "should delete existing key" do
|
||||||
|
expect {
|
||||||
|
delete api("/projects/#{project.id}/keys/#{deploy_key.id}", user)
|
||||||
|
}.to change{ project.deploy_keys.count }.by(-1)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should return 404 Not Found with invalid ID" do
|
||||||
|
delete api("/projects/#{project.id}/keys/404", user)
|
||||||
|
response.status.should == 404
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue