Merge pull request #1162 from travis-ci/pd-fix-restart-for-legacy-plans

Rescue NotFound exception when authorizing build restart

Author: Shairyar Baig

lib/travis/api/enqueue/services/restart_model.rb

@@ -44,6 +44,9 @@ def billing?
           rescue Travis::API::V3::InsufficientAccess => e
             @cause_of_denial = e.message
             false
+          rescue Travis::API::V3::NotFound
+            # Owner is on a legacy plan
+            true
           end
         end
 

spec/v3/services/job/restart_spec.rb

@@ -219,6 +219,47 @@
       example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Hub::Sidekiq::Worker' }
     end
 
+    context 'billing authorization' do
+      context 'billing service authorizes the job' do
+        before do
+          stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
+            body: MultiJson.dump(allowed: true, rejection_code: :nil), status: 200
+          )
+        end
+
+        it 'restarts the job' do
+          post("/v3/job/#{job.id}/restart", params, headers)
+          expect(last_response.status).to eq(202)
+        end
+      end
+
+      context 'billing service returns 404 (user is not on a new plan)' do
+        before do
+          stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
+            body: MultiJson.dump(error: 'Plan not found'), status: 404
+          )
+        end
+
+        it 'restarts the job' do
+          post("/v3/job/#{job.id}/restart", params, headers)
+          expect(last_response.status).to eq(202)
+        end
+      end
+
+      context 'billing service rejects the job' do
+        before do
+          stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
+            body: MultiJson.dump(allowed: false, rejection_code: :no_build_credits), status: 403
+          )
+        end
+
+        it 'does not restart the job' do
+          post("/v3/job/#{job.id}/restart", params, headers)
+          expect(last_response.status).to eq(403)
+        end
+      end
+    end
+
     describe "passed state" do
       include_examples 'clears debug_options'