Add feature flag to enqueue restart build to Hub

This commit is contained in:
Ana Rosas 2016-05-19 14:21:49 -05:00
parent 9bbfb7ec97
commit 9bd145856b
4 changed files with 36 additions and 14 deletions

View File

@ -426,6 +426,3 @@ DEPENDENCIES
travis-yaml! travis-yaml!
unicorn unicorn
yard-sinatra! yard-sinatra!
BUNDLED WITH
1.11.2

View File

@ -1,5 +1,6 @@
require 'travis/api/app' require 'travis/api/app'
require 'travis/api/workers/build_cancellation' require 'travis/api/workers/build_cancellation'
require 'travis/api/workers/build_restart'
require 'travis/api/enqueue/services/enqueue_build' require 'travis/api/enqueue/services/enqueue_build'
class Travis::Api::App class Travis::Api::App
@ -54,8 +55,12 @@ class Travis::Api::App
status 400 status 400
result = false result = false
else else
if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
payload = {id: params[:id], user_id: current_user.id} payload = {id: params[:id], user_id: current_user.id}
Travis::Enqueue::Services::EnqueueBuild.push("build:restart", payload) Travis::Enqueue::Services::EnqueueBuild.push("build:restart", payload)
else
Travis::Sidekiq::BuildRestart.perform_async(id: params[:id], user_id: current_user.id)
end
status 202 status 202
result = true result = true

View File

@ -2,6 +2,7 @@
require 'sidekiq' require 'sidekiq'
require 'travis' require 'travis'
require 'travis/api/workers/build_cancellation' require 'travis/api/workers/build_cancellation'
require 'travis/api/workers/build_restart'
require 'travis/api/workers/job_cancellation' require 'travis/api/workers/job_cancellation'
require 'travis/api/workers/job_restart' require 'travis/api/workers/job_restart'
require 'travis/support/amqp' require 'travis/support/amqp'

View File

@ -118,6 +118,9 @@ describe 'Builds' do
build.update_attribute(:state, 'passed') build.update_attribute(:state, 'passed')
end end
describe 'Enqueues restart event to the Hub' do
before { Travis::Features.activate_owner(:enqueue_to_hub, repo.owner) }
it 'restarts the build' do it 'restarts the build' do
Travis::Enqueue::Services::EnqueueBuild.expects(:push).with("build:restart", {id: build.id.to_s, user_id: user.id}) Travis::Enqueue::Services::EnqueueBuild.expects(:push).with("build:restart", {id: build.id.to_s, user_id: user.id})
response = post "/builds/#{build.id}/restart", {}, headers response = post "/builds/#{build.id}/restart", {}, headers
@ -131,5 +134,21 @@ describe 'Builds' do
body.should == {"result"=>true, "flash"=>[{"notice"=>"The build was successfully restarted."}]} body.should == {"result"=>true, "flash"=>[{"notice"=>"The build was successfully restarted."}]}
end end
end end
describe 'Restart from the Core' do
it 'restarts the build' do
Travis::Sidekiq::BuildRestart.expects(:perform_async).with(id: build.id.to_s, user_id: user.id)
response = post "/builds/#{build.id}/restart", {}, headers
response.status.should == 202
end
it 'sends the correct response body' do
Travis::Sidekiq::BuildRestart.expects(:perform_async).with(id: build.id.to_s, user_id: user.id)
response = post "/builds/#{build.id}/restart", {}, headers
body = JSON.parse(response.body)
body.should == {"result"=>true, "flash"=>[{"notice"=>"The build was successfully restarted."}]}
end
end
end
end end
end end