From 54e9d2fd063dea2a153fc23121b7b62e656036d6 Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Mon, 11 Jul 2016 15:20:34 -0500 Subject: [PATCH] Get type of model in order to call correct restart event --- lib/travis/api/app/endpoint/requests.rb | 7 ++++--- spec/integration/v2/requests_spec.rb | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/travis/api/app/endpoint/requests.rb b/lib/travis/api/app/endpoint/requests.rb index bd851318..3c9c96f2 100644 --- a/lib/travis/api/app/endpoint/requests.rb +++ b/lib/travis/api/app/endpoint/requests.rb @@ -30,16 +30,17 @@ 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 }) + service = Travis::Enqueue::Services::RestartModel.new(current_user, params) repository_owner = service.target.repository.owner if !Travis::Features.enabled_for_all?(:enqueue_to_hub) && !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner) respond_with service(:reset_model, params) elsif service.respond_to?(:push) params[:user_id] = repository_owner.id - type ||= @params[:build_id] ? 'build' : 'job' - service.push("#{type}:restart", params) + 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 diff --git a/spec/integration/v2/requests_spec.rb b/spec/integration/v2/requests_spec.rb index d92b568c..a51e45e6 100644 --- a/spec/integration/v2/requests_spec.rb +++ b/spec/integration/v2/requests_spec.rb @@ -39,6 +39,12 @@ describe 'Requests', set_app: true do response = post "/requests", payload, headers response.status.should be(200) 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 end end