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

View File

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

View File

@ -522,11 +522,7 @@ describe API::Runners do
describe 'POST /projects/:id/runners' do
context 'authorized user' do
let(:project_runner2) do
create(:ci_runner).tap do |runner|
create(:ci_runner_project, runner: runner, project: project2)
end
end
let(:project_runner2) { create(:ci_runner, :project, projects: [project2]) }
it 'enables specific runner' do
expect do
@ -539,7 +535,7 @@ describe API::Runners do
expect do
post api("/projects/#{project.id}/runners", user), runner_id: project_runner.id
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
it 'does not enable locked runner' do