From f09e9931b26628bfdcf328af7e7156ae165209e6 Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Tue, 2 Aug 2016 09:39:00 -0500 Subject: [PATCH 1/2] Restoring requests code --- lib/travis/api/app/endpoint/requests.rb | 11 +++++++---- spec/integration/v2/requests_spec.rb | 9 ++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/travis/api/app/endpoint/requests.rb b/lib/travis/api/app/endpoint/requests.rb index d8c05a5d..aadec368 100644 --- a/lib/travis/api/app/endpoint/requests.rb +++ b/lib/travis/api/app/endpoint/requests.rb @@ -29,11 +29,14 @@ class Travis::Api::App # # I think we need to properly deprecate this by publishing a blog post. Metriks.meter("api.request.restart").mark + service = Travis::Enqueue::Services::RestartModel.new(current_user, params) + params[:user_id] = service.target.repository.owner.id - service = Travis::Enqueue::Services::RestartModel.new(current_user, { build_id: params[:build_id] }) - payload = {id: params[:build_id], user_id: current_user.id} - service.push("job:restart", payload) - status 202 + type ||= params[:build_id] ? 'build' : 'job' + params[:id] = params[:build_id] || params[:job_id] + + service.push("#{type}:restart", params) + respond_with(result: true, flash: service.messages) end end end diff --git a/spec/integration/v2/requests_spec.rb b/spec/integration/v2/requests_spec.rb index de40b043..60c3eb86 100644 --- a/spec/integration/v2/requests_spec.rb +++ b/spec/integration/v2/requests_spec.rb @@ -30,7 +30,14 @@ describe 'Requests', set_app: true do describe 'POST /requests' do it 'triggers a build request using Hub' do response = post "/requests", { build_id: build.id }, headers - response.status.should be(202) + response.status.should be(200) end end + + it 'triggers a job request' do + payload = { job_id: build.matrix.first.id, user_id: repo.owner.id } + response = post "/requests", payload, headers + response.status.should be(200) + end + end From 0f2b1edae1bc2b3b780369af7989920b98751de1 Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Tue, 2 Aug 2016 10:02:44 -0500 Subject: [PATCH 2/2] Remove unnecessary sign --- lib/travis/api/app/endpoint/requests.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/travis/api/app/endpoint/requests.rb b/lib/travis/api/app/endpoint/requests.rb index aadec368..d8a18fdf 100644 --- a/lib/travis/api/app/endpoint/requests.rb +++ b/lib/travis/api/app/endpoint/requests.rb @@ -32,7 +32,7 @@ class Travis::Api::App service = Travis::Enqueue::Services::RestartModel.new(current_user, params) params[:user_id] = service.target.repository.owner.id - type ||= params[:build_id] ? 'build' : 'job' + type = params[:build_id] ? 'build' : 'job' params[:id] = params[:build_id] || params[:job_id] service.push("#{type}:restart", params)