From 4528fa9817f2f9ba9ccf330ea2c9f6575b6a3c4b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 6 May 2013 16:24:58 +0300 Subject: [PATCH] modify api to work with new deploy keys --- lib/api/internal.rb | 4 +- lib/api/projects.rb | 7 +-- lib/api/users.rb | 2 +- spec/models/project_spec.rb | 3 +- spec/requests/api/projects_spec.rb | 90 +++++++++++++++--------------- 5 files changed, 54 insertions(+), 52 deletions(-) diff --git a/lib/api/internal.rb b/lib/api/internal.rb index affe1be54dd..3e1173bd0a3 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -25,8 +25,8 @@ module Gitlab return false unless project - if key.is_deploy_key - project == key.project && git_cmd == 'git-upload-pack' + if key.is_a? DeployKey + key.projects.include?(project) && git_cmd == 'git-upload-pack' else user = key.user diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 75157e55730..53fd91dcca8 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -531,8 +531,8 @@ module Gitlab # POST /projects/:id/keys post ":id/keys" do attrs = attributes_for_keys [:title, :key] - key = user_project.deploy_keys.new attrs - if key.save + key = DeployKey.new attrs + if key.valid? && user_project.deploy_keys << key present key, with: Entities::SSHKey else not_found! @@ -545,9 +545,8 @@ module Gitlab # DELETE /projects/:id/keys/:id delete ":id/keys/:key_id" do key = user_project.deploy_keys.find params[:key_id] - key.delete + key.destroy end - end end end diff --git a/lib/api/users.rb b/lib/api/users.rb index 4198387d403..cda543495a0 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -174,7 +174,7 @@ module Gitlab delete "keys/:id" do begin key = current_user.keys.find params[:id] - key.delete + key.destroy rescue end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index b7eb7391072..6b7799f7af7 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -37,7 +37,8 @@ describe Project do it { should have_many(:users_projects).dependent(:destroy) } it { should have_many(:notes).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(:protected_branches).dependent(:destroy) } it { should have_one(:forked_project_link).dependent(:destroy) } diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 1a93148139e..a3620d0a6a5 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -13,7 +13,6 @@ describe Gitlab::API do 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_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) } - let(:key) { create(:key, project: project) } before { project.team << [user, :reporter] } @@ -636,58 +635,61 @@ describe Gitlab::API do end end - describe "GET /projects/:id/keys" do - it "should return array of ssh keys" do - project.deploy_keys << 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 :deploy_keys do + let(:deploy_keys_project) { create(:deploy_keys_project, project: project) } + let(:deploy_key) { deploy_keys_project.deploy_key } - describe "GET /projects/:id/keys/:key_id" do - it "should return a single key" do - project.deploy_keys << key - project.save - get api("/projects/#{project.id}/keys/#{key.id}", user) - response.status.should == 200 - json_response['title'].should == key.title + describe "GET /projects/:id/keys" do + before { deploy_key } + + it "should return array of ssh keys" do + get api("/projects/#{project.id}/keys", user) + response.status.should == 200 + json_response.should be_an Array + json_response.first['title'].should == deploy_key.title + end end - it "should return 404 Not Found with invalid ID" do - get api("/projects/#{project.id}/keys/404", user) - response.status.should == 404 - end - end + describe "GET /projects/:id/keys/:key_id" do + it "should return a single key" do + get api("/projects/#{project.id}/keys/#{deploy_key.id}", user) + response.status.should == 200 + json_response['title'].should == deploy_key.title + end - describe "POST /projects/:id/keys" do - it "should not create an invalid ssh key" do - post api("/projects/#{project.id}/keys", user), { title: "invalid key" } - response.status.should == 404 + it "should return 404 Not Found with invalid ID" do + get api("/projects/#{project.id}/keys/404", user) + response.status.should == 404 + end end - it "should create new ssh key" do - key_attrs = attributes_for :key - expect { - post api("/projects/#{project.id}/keys", user), key_attrs - }.to change{ project.deploy_keys.count }.by(1) - end - end + describe "POST /projects/:id/keys" do + it "should not create an invalid ssh key" do + post api("/projects/#{project.id}/keys", user), { title: "invalid key" } + response.status.should == 404 + end - describe "DELETE /projects/:id/keys/:key_id" do - it "should delete existing key" do - project.deploy_keys << key - project.save - expect { - delete api("/projects/#{project.id}/keys/#{key.id}", user) - }.to change{ project.deploy_keys.count }.by(-1) + it "should create new ssh key" do + key_attrs = attributes_for :key + expect { + post api("/projects/#{project.id}/keys", user), key_attrs + }.to change{ project.deploy_keys.count }.by(1) + end end - it "should return 404 Not Found with invalid ID" do - delete api("/projects/#{project.id}/keys/404", user) - response.status.should == 404 + describe "DELETE /projects/:id/keys/:key_id" do + before { deploy_key } + + 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