diff --git a/lib/travis/api/v3/queries/job.rb b/lib/travis/api/v3/queries/job.rb index ba824d4d..e6b0b7d2 100644 --- a/lib/travis/api/v3/queries/job.rb +++ b/lib/travis/api/v3/queries/job.rb @@ -1,3 +1,6 @@ +require 'travis/api/enqueue/services/restart_model' +require 'travis/api/enqueue/services/cancel_model' + module Travis::API::V3 class Queries::Job < Query params :id @@ -10,7 +13,12 @@ module Travis::API::V3 def cancel(user) raise JobNotCancelable if %w(passed failed canceled errored).include? find.state payload = { id: id, user_id: user.id, source: 'api' } - perform_async(:job_cancellation, payload) + if Travis::Features.owner_active?(:enqueue_to_hub, user) + service = Travis::Enqueue::Services::CancelModel.new(user, payload) + service.push + else + perform_async(:job_cancellation, payload) + end payload end diff --git a/spec/v3/services/job/cancel_spec.rb b/spec/v3/services/job/cancel_spec.rb index 48faac52..b429cfa6 100644 --- a/spec/v3/services/job/cancel_spec.rb +++ b/spec/v3/services/job/cancel_spec.rb @@ -9,6 +9,7 @@ describe Travis::API::V3::Services::Job::Cancel do before do Travis::Features.stubs(:owner_active?).returns(true) + Travis::Features.stubs(:owner_active?).with(:enqueue_to_hub, repo.owner).returns(false) @original_sidekiq = Sidekiq::Client Sidekiq.send(:remove_const, :Client) # to avoid a warning Sidekiq::Client = [] @@ -174,6 +175,107 @@ describe Travis::API::V3::Services::Job::Cancel do } end end + + describe "existing repository, push access, job cancelable, enqueues message for Hub" do + let(:params) {{}} + let(:token) { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) } + let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}" }} + before do + Travis::API::V3::Models::Permission.create(repository: repo, user: repo.owner, push: true, pull: true) + Travis::Features.stubs(:owner_active?).with(:enqueue_to_hub, repo.owner).returns(true) + end + + describe "started state" do + before { job.update_attribute(:state, "started") } + before { post("/v3/job/#{job.id}/cancel", params, headers) } + + example { expect(last_response.status).to be == 202 } + example { expect(JSON.load(body).to_s).to include( + "@type", + "pending", + "job", + "@href", + "@representation", + "minimal", + "cancel", + "id", + "state_change") + } + + example { expect(sidekiq_payload).to be == { + "id" => "#{job.id}", + "user_id"=> repo.owner_id, + "source" => "api"} + } + + example { expect(Sidekiq::Client.last['queue']).to be == 'hub' } + example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Hub::Sidekiq::Worker' } + end + describe "queued state" do + before { job.update_attribute(:state, "queued") } + before { post("/v3/job/#{job.id}/cancel", params, headers) } + + example { expect(last_response.status).to be == 202 } + example { expect(JSON.load(body).to_s).to include( + "@type", + "pending", + "job", + "@href", + "@representation", + "minimal", + "cancel", + "id", + "state_change") + } + + example { expect(sidekiq_payload).to be == { + "id" => "#{job.id}", + "user_id"=> repo.owner_id, + "source" => "api"} + } + + example { expect(Sidekiq::Client.last['queue']).to be == 'hub' } + example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Hub::Sidekiq::Worker' } + end + + describe "received state" do + before { job.update_attribute(:state, "received") } + before { post("/v3/job/#{job.id}/cancel", params, headers) } + + example { expect(last_response.status).to be == 202 } + example { expect(JSON.load(body).to_s).to include( + "@type", + "pending", + "job", + "@href", + "@representation", + "minimal", + "cancel", + "id", + "state_change") + } + + example { expect(sidekiq_payload).to be == { + "id" => "#{job.id}", + "user_id"=> repo.owner_id, + "source" => "api"} + } + + example { expect(Sidekiq::Client.last['queue']).to be == 'hub' } + example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Hub::Sidekiq::Worker' } + end + + describe "setting id has no effect" do + before { post("/v3/job/#{job.id}/cancel", params, headers) } + let(:params) {{ id: 42 }} + example { expect(sidekiq_payload).to be == { + "id" => "#{job.id}", + "user_id"=> repo.owner_id, + "source" => "api"} + } + end + end + describe "existing repository, push access, not cancelable" do let(:params) {{}} let(:token) { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }