From bcbf0abf60ba0b92ccbf17d75530a93eb35f183c Mon Sep 17 00:00:00 2001
From: Aakriti Gupta <aakriti@travis-ci.org>
Date: Wed, 20 Jul 2016 11:20:19 +0200
Subject: [PATCH] Remove feature flip from requests endpoint

---
 lib/travis/api/app/endpoint/requests.rb | 17 ++++-------------
 spec/integration/v2/requests_spec.rb    | 18 ++----------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/lib/travis/api/app/endpoint/requests.rb b/lib/travis/api/app/endpoint/requests.rb
index 3c9c96f2..d8c05a5d 100644
--- a/lib/travis/api/app/endpoint/requests.rb
+++ b/lib/travis/api/app/endpoint/requests.rb
@@ -30,19 +30,10 @@ 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)
-          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'
-            params[:id] = params[:build_id] || params[:job_id]
-
-            service.push("#{type}:restart", params)
-            respond_with(result: true, flash: service.messages)
-          end
+          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
         end
       end
     end
diff --git a/spec/integration/v2/requests_spec.rb b/spec/integration/v2/requests_spec.rb
index a51e45e6..de40b043 100644
--- a/spec/integration/v2/requests_spec.rb
+++ b/spec/integration/v2/requests_spec.rb
@@ -28,23 +28,9 @@ describe 'Requests', set_app: true do
   end
 
   describe 'POST /requests' do
-    it 'triggers a build request using Core code' do
+    it 'triggers a build request using Hub' do
       response = post "/requests", { build_id: build.id }, headers
-      response.status.should be(200)
-    end
-
-    describe 'enqueues for Hub' do
-      it 'triggers a build request' do
-        payload = { build_id: build.id, user_id: repo.owner.id }
-        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
+      response.status.should be(202)
     end
   end
 end