Improving the way env is being checked

Author: shairyar

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

@@ -32,7 +32,7 @@ def accept?
 
         def billing?
           # there is no billing for .org
-          return true if ENV["TRAVIS_SITE"] == 'org'
+          return true if Travis.config.org?
 
           @_billing_ok ||= begin
             jobs = target.is_a?(Job) ? [target] : target.matrix

spec/lib/travis/api/enqueue/services/restart_model_spec.rb

@@ -10,7 +10,6 @@
   before do
     Travis.config.billing.url = 'http://localhost:9292/'
     Travis.config.billing.auth_key = 'secret'
-    ENV['TRAVIS_SITE'] = 'com'
   end
 
   after do

spec/v3/services/job/restart_spec.rb

@@ -238,6 +238,7 @@
           stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
             body: MultiJson.dump(error: 'Plan not found'), status: 404
           )
+          Travis.config.host = 'travis-ci.com'
         end
 
         it 'restarts the job' do
@@ -251,6 +252,7 @@
           stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
             body: MultiJson.dump(allowed: false, rejection_code: :no_build_credits), status: 403
           )
+          Travis.config.host = 'travis-ci.com'
         end
 
         it 'does not restart the job' do