root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Improve Runners API validations

This commit is contained in:
Kamil Trzciński 2018-05-28 13:41:04 +02:00 committed by Dylan Griffith
parent 385f37a724
commit 5805e92299
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/api/runners.rb
View File

@ -136,7 +136,7 @@ module API
if runner.assign_to(user_project) if runner.assign_to(user_project)
present runner, with: Entities::Runner present runner, with: Entities::Runner
else else
conflict!("Runner was already enabled for this project") render_validation_error!(runner)
end end
end end

8
spec/requests/api/runners_spec.rb
View File

@ -522,11 +522,7 @@ describe API::Runners do
describe 'POST /projects/:id/runners' do describe 'POST /projects/:id/runners' do
context 'authorized user' do context 'authorized user' do
let(:project_runner2) do let(:project_runner2) { create(:ci_runner, :project, projects: [project2]) }
create(:ci_runner).tap do |runner|
create(:ci_runner_project, runner: runner, project: project2)
end
end
it 'enables specific runner' do it 'enables specific runner' do
expect do expect do
@ -539,7 +535,7 @@ describe API::Runners do
expect do expect do
post api("/projects/#{project.id}/runners", user), runner_id: project_runner.id post api("/projects/#{project.id}/runners", user), runner_id: project_runner.id
end.to change { project.runners.count }.by(0) end.to change { project.runners.count }.by(0)
expect(response).to have_gitlab_http_status(409) expect(response).to have_gitlab_http_status(400)
end end
it 'does not enable locked runner' do it 'does not enable locked runner' do