get rid of spec_helper_core

.rspec

@@ -1,2 +1,3 @@
+--require spec_helper
 --colour
 --tty

Rakefile

@@ -9,30 +9,39 @@ namespace :db do
   end
 end
 
-begin
+# begin
-  require 'rspec'
+#   require 'rspec'
-  require 'rspec/core/rake_task'
+#   require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
+#   RSpec::Core::RakeTask.new(:spec)
+#
+#   RSpec::Core::RakeTask.new(:spec_core) do |t|
+#     t.pattern = 'spec_core/**{,/*/**}/*_spec.rb'
+#   end
+#
+#   task :default => [:spec, :spec_core]
+# rescue LoadError => e
+#   puts e.inspect
+# end
 
-  RSpec::Core::RakeTask.new(:spec_core) do |t|
+# not sure how else to include the spec_helper
-    t.pattern = 'spec_core/**{,/*/**}/*_spec.rb'
+namespace :spec do
+  desc 'Run api specs'
+  task :api do
+    sh 'bundle exec rspec -r spec_helper spec'
   end
 
-  task :default => [:spec, :spec_core]
+  desc 'Run core specs'
-rescue LoadError => e
+  task :core do
-  puts e.inspect
+    sh 'bundle exec rspec -r spec_helper spec_core'
+  end
 end
 
+task :default => %w(spec:api spec:core)
+
 desc "generate gemspec"
 task 'travis-api.gemspec' do
   content = File.read 'travis-api.gemspec'
 
-  fields = {
-    authors: `git shortlog -sn`.scan(/[^\d\s].*/),
-    email:   `git shortlog -sne`.scan(/[^<]+@[^>]+/),
-    files:   `git ls-files`.split("\n").reject { |f| f =~ /^(\.|Gemfile)/ }
-  }
-
   fields.each do |field, values|
     updated = "  s.#{field} = ["
     updated << values.map { |v| "\n    %p" % v }.join(',')
@@ -43,7 +52,3 @@ task 'travis-api.gemspec' do
   File.open('travis-api.gemspec', 'w') { |f| f << content }
 end
 task default: 'travis-api.gemspec'
-
-## can this be removed? what other rakefiles need to be included?
-# tasks_path = File.expand_path('../lib/tasks/*.rake', __FILE__)
-# Dir.glob(tasks_path).each { |r| import r }

lib/travis/api/app.rb

@@ -92,14 +92,13 @@ module Travis::Api
 
     def initialize
       @app = Rack::Builder.app do
-
+        # if stackprof = ENV['STACKPROF']
-        if stackprof = ENV['STACKPROF']
+        #   require 'stackprof'
-          require 'stackprof'
+        #   modes = ['wall', 'cpu', 'object', 'custom']
-          modes = ['wall', 'cpu', 'object', 'custom']
+        #   mode  = modes.include?(stackprof) ? stackprof.to_sym : :cpu
-          mode  = modes.include?(stackprof) ? stackprof.to_sym : :cpu
+        #   Travis.logger.info "Setting up profiler: #{mode}"
-          Travis.logger.info "Setting up profiler: #{mode}"
+        #   use StackProf::Middleware, enabled: true, save_every: 1, mode: mode
-          use StackProf::Middleware, enabled: true, save_every: 1, mode: mode
+        # end
-        end
 
         extend StackInstrumentation
         use Travis::Api::App::Middleware::Skylight

lib/travis/api/app/endpoint/requests.rb

@@ -22,6 +22,11 @@ class Travis::Api::App
           status 404
         else
           # DEPRECATED: this will be removed by 1st of December
+          #
+          # TODO It seems this endpoint is still in use, quite a bit:
+          # https://metrics.librato.com/s/metrics/api.request.restart?duration=2419200&q=api.request.restart
+          #
+          # I think we need to properly deprecate this by publishing a blog post.
           Metriks.meter("api.request.restart").mark
           respond_with service(:reset_model, params)
         end

spec/active_record_postgres_variables_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "ActiveRecordPostgresVariables" do
   let(:variables) {{ foo: 'bar' }}
   let(:database_options) { Travis.config.database.merge(variables: variables) }

spec/integration/error_handling_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
 require 'sentry-raven'
 
-describe 'Exception' do
+describe 'Exception', set_app: true do
-
   class FixRaven < Struct.new(:app)
     def call(env)
       requested_at = env['requested_at']

spec/integration/formats_handling_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe 'App', set_app: true do
-
-describe 'App' do
   before do
     FactoryGirl.create(:test, :number => '3.1', :queue => 'builds.common')
 

spec/integration/responders_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'App' do
   before do
     FactoryGirl.create(:test, :number => '3.1', :queue => 'builds.common')

spec/integration/routes.backup.rb

@@ -1,23 +0,0 @@
-  # api = lambda do
-  #   constraints :format => 'json' do
-  #     resources :repositories, :only => [:index, :show] do
-  #       resources :builds,     :only => [:index, :show]
-  #     end
-  #     resources :builds,       :only => [:index, :show]
-  #     resources :branches,     :only => :index
-  #     resources :jobs,         :only => [:index, :show]
-  #     resources :workers,      :only => :index
-
-  #     get 'service_hooks',     :to => 'service_hooks#index'
-  #     put 'service_hooks/:id', :to => 'service_hooks#update', :id => /[\w-]*:[\w.-]*/
-  #   end
-
-  #   constraints :owner_name => /[^\/]+/, :name => /[^\/]+/ do
-  #     get ':owner_name/:name.json',            :to => 'repositories#show', :format => :json
-  #     get ':owner_name/:name/builds.json',     :to => 'builds#index',      :format => :json
-  #     get ':owner_name/:name/builds/:id.json', :to => 'builds#show',       :format => :json
-  #     get ':owner_name/:name.png',             :to => 'repositories#show', :format => :png
-  #     get ':owner_name/:name/cc.xml',          :to => 'repositories#show', :format => :xml, :schema => 'cctray'
-  #   end
-  # end
-

spec/integration/scopes_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'App' do
   before do
     FactoryGirl.create(:test, :number => '3.1', :queue => 'builds.common')

spec/integration/settings_endpoint_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::SettingsEndpoint do
   let(:repo)    { Repository.by_slug('svenfuchs/minimal').first }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }

spec/integration/singleton_settings_endpoint_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::SettingsEndpoint do
   let(:repo)    { Repository.by_slug('svenfuchs/minimal').first }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }

spec/integration/uptime_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe 'Uptime', set_app: true do
-
-describe 'Uptime' do
   after do
     ActiveRecord::Base.connection.unstub(:execute)
   end

spec/integration/v2/branches_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe 'Branches', set_app: true do
-
-describe 'Branches' do
   let(:repo)    { Repository.by_slug('svenfuchs/minimal').first }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }
 

spec/integration/v2/builds_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe 'Builds', set_app: true do
-
-describe 'Builds' do
   let(:repo)  { Repository.by_slug('svenfuchs/minimal').first }
   let(:build) { repo.builds.first }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }

spec/integration/v2/hooks_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
 require 'travis/testing/payloads'
 
-describe 'Hooks' do
+describe 'Hooks', set_app: true do
   before(:each) do
     user.permissions.create repository: repo, admin: true
   end

spec/integration/v2/jobs_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe 'Jobs', set_app: true do
-
-describe 'Jobs' do
   let!(:jobs) {[
     FactoryGirl.create(:test, :number => '3.1', :queue => 'builds.common'),
     FactoryGirl.create(:test, :number => '3.2', :queue => 'builds.common')

spec/integration/v2/repositories_spec.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
-require 'spec_helper'
 
-describe 'Repos' do
+describe 'Repos', set_app: true do
   let(:repo)    { Repository.by_slug('svenfuchs/minimal').first }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }
 
@@ -31,12 +30,14 @@ describe 'Repos' do
     before { user.permissions.create!(:repository_id => repo.id, :admin => true, :push => true) }
 
     it 'POST /repos/:id/key' do
+      repo.regenerate_key!
       expect {
         response = post "/repos/#{repo.id}/key", {}, headers
       }.to change { repo.reload.key.private_key }
     end
 
     it 'POST /repos/:owner/:name/key' do
+      repo.regenerate_key!
       expect {
         response = post "/repos/#{repo.slug}/key", {}, headers
       }.to change { repo.reload.key.private_key }
@@ -86,11 +87,13 @@ describe 'Repos' do
   end
 
   it 'GET /repos/:id/key' do
+    repo.regenerate_key!
     response = get "/repos/#{repo.id}/key", {}, headers
     response.should deliver_json_for(repo.key, version: 'v2')
   end
 
   it 'GET /repos/:slug/key' do
+    repo.regenerate_key!
     response = get "/repos/#{repo.slug}/key", {}, headers
     response.should deliver_json_for(repo.key, version: 'v2')
   end

spec/integration/v2/requests_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
 require 'json'
 
-describe 'Requests' do
+describe 'Requests', set_app: true do
   let(:repo)    { Factory.create(:repository) }
   let(:request) { Factory.create(:request, repository: repo) }
   let(:user)    { Factory.create(:user) }

spec/integration/v2/settings/env_vars_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::SettingsEndpoint, set_app: true do
-
-describe Travis::Api::App::SettingsEndpoint do
   let(:repo)    { Repository.by_slug('svenfuchs/minimal').first }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }
 

spec/integration/v2/settings/ssh_key_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe 'ssh keys endpoint', set_app: true do
-
-describe 'ssh keys endpoint' do
   let(:repo)    { Factory(:repository) }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }
 

spec/integration/v2/users_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe 'Users', set_app: true do
-
-describe 'Users' do
   let(:user)    { User.first }
   let(:token)   { Travis::Api::App::AccessToken.create(user: user, app_id: -1) }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json', 'HTTP_AUTHORIZATION' => "token #{token}" } }

spec/integration/v2_spec.backup.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'v2' do
   let(:format)     { :json }
   let(:params)     { { :controller => controller, :action => action, :format => format } }

spec/integration/version_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'App' do
   before do
     add_endpoint '/foo' do

spec/spec_helper.rb

@@ -1,57 +1,28 @@
 ENV['RACK_ENV'] = ENV['RAILS_ENV'] = ENV['ENV'] = 'test'
 
-require 'support/coverage'
+require 'support/coverage' unless ENV['SKIP_COVERAGE']
 
 require 'rspec'
 require 'rspec/its'
 require 'database_cleaner'
-require 'sinatra/test_helpers'
 require 'logger'
 require 'gh'
 require 'multi_json'
+require 'pry'
+require 'stackprof'
 
 require 'travis/api/app'
 require 'travis/testing'
 require 'travis/testing/scenario'
 require 'travis/testing/factories'
 require 'travis/testing/matchers'
-require 'support/matchers'
 require 'support/formats'
-
+require 'support/gcs'
-require 'pry'
+require 'support/matchers'
-
+require 'support/payloads'
-Travis.logger = Logger.new(StringIO.new)
+require 'support/private_key'
-Travis::Api::App.setup
+require 'support/s3'
-Travis.config.client_domain = "www.example.com"
+require 'support/test_helpers'
-Travis.config.endpoints.ssh_key = true
-
-module TestHelpers
-  include Sinatra::TestHelpers
-
-  def custom_endpoints
-    @custom_endpoints ||= []
-  end
-
-  def add_settings_endpoint(name, options = {})
-    if options[:singleton]
-      Travis::Api::App::SingletonSettingsEndpoint.subclass(name)
-    else
-      Travis::Api::App::SettingsEndpoint.subclass(name)
-    end
-    set_app Travis::Api::App.new
-  end
-
-  def add_endpoint(prefix, &block)
-    endpoint = Sinatra.new(Travis::Api::App::Endpoint, &block)
-    endpoint.set(prefix: prefix)
-    set_app Travis::Api::App.new
-    custom_endpoints << endpoint
-  end
-
-  def parsed_body
-    MultiJson.decode(body)
-  end
-end
 
 RSpec.configure do |c|
   c.mock_framework = :mocha
@@ -59,52 +30,33 @@ RSpec.configure do |c|
   c.include TestHelpers
 
   c.before :suite do
-    DatabaseCleaner.strategy = :transaction
+    Travis.logger = Logger.new(StringIO.new)
+    Travis::Api::App.setup
+    Travis.config.client_domain = "www.example.com"
+    Travis.config.endpoints.ssh_key = true
+
     DatabaseCleaner.clean_with :truncation
+    DatabaseCleaner.strategy = :transaction
+
     Scenario.default
   end
 
   c.before :each do
     DatabaseCleaner.start
-    ::Redis.connect(url: Travis.config.redis.url).flushdb
+    Redis.new.flushall
-    Travis.config.oauth2 ||= {}
     Travis.config.oauth2.scope = "user:email,public_repo"
+    # set_app Travis::Api::App.new
+  end
+
+  c.before :each, set_app: true do
     set_app Travis::Api::App.new
   end
 
   c.after :each do
+    # puts DatabaseCleaner.connections.map(&:strategy).map(&:class).map(&:name).join(', ')
     DatabaseCleaner.clean
     custom_endpoints.each do |endpoint|
       endpoint.superclass.direct_subclasses.delete(endpoint)
     end
   end
 end
-
-TEST_PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA6Dm1n+fc0ILeLWeiwqsWs1MZaGAfccrmpvuxfcE9UaJp2POy
-079g+mdiBgtWfnQlU84YX31rU2x9GJwnb8G6UcvkEjqczOgHHmELtaNmrRH1g8qO
-fJpzXB8XiNib1L3TDs7qYMKLDCbl2bWrcO7Dol9bSqIeb7f9rzkCd4tuXObL3pMD
-/VIW5uzeVqLBAc0Er+qw6U7clnMnHHMekXt4JSRfauSCxktR2FzigoQbJc8t4iWO
-rmNi5Q84VkXB3X7PO/eajUw+RJOl6FnPN1Zh08ceqcqmSMM4RzeVQaczXg7P92P4
-mRF41R97jIJyzUGwheb2Z4Q2rltck4V7R5BvMwIDAQABAoIBAE4O3+MRH+MiqiXe
-+RGwSqAaZab08Hzic+dbIQ0hQEhJbITVXZ3ZbXKd/5ACjZ9R0R47X2vxj3rqM55r
-FsJ0/vjxrQcHlp81uvbWLgZvF1tDdyBGnOB7Vh14AgQoszCuYdxPZu8BVZXPGWG1
-tBvw1eelX91VYx+wW+BjLFYckws8kPCPY6WEnng0wQGShGqyTOJa1T4M1ethHYF+
-ddNx+fVLkEf2vL59popuJMOAyVa1jvU7D3VZ67qhlxWAvQxZeEP0vFZHeWPjvRF1
-orxiGuwLCG+Rgq1XSVJjMNf1qE3gZTlDg+u3ORKbRx2xlhiqpkHxLx7QtCmELwtD
-Dqvf8ukCgYEA/SoQwyfMp4t19FLI4tV0rp3Yn7ZSAqRtMVrLVAIQoJzDXv9BaJFS
-xb6enxRAjy+Rg10H8ijh8Z9Z3a4g3JViHQsWMrf9rL2/7M07vraIUIQoVo7yTeGa
-MXnTuKmBZFGEAM9CzqAVao1Om10TRFNLgiLAU3ZEFi8J1DYWkhzrJp0CgYEA6tOa
-V15MP3sJSlOTszshXKbwf6iXfjHbdpGUXmd9X3AMzOvl/CEGS2q46lwJISubHWKF
-BOKk1thumM4Zu6dx89hLEoXhFycgUV/KJYl54ZfhY079Ri7SZUYIqDR04BRJC2d6
-mO16Y//UwqgTaZ/lS/S791iWPTjVNEgSlRbQHA8CgYALiOEeoy+V6qrDKQpyG1un
-oRV/oWT3LdqzxvlAqJ9tUfcs2uB2DTkCPX8orFmMrJQqshBsniQ9SA9mJErnAf9o
-Z1rpkKyENFkMRwWT2Ok5EexslTLBDahi3LQi08ZLddNX3hmjJHQVWL7eIU2BbXIh
-ScgNhXPwts/x1U0N9zdXmQKBgQC4O6W2cAQQNd5XEvUpQ/XrtAmxjjq0xjbxckve
-OQFy0/0m9NiuE9bVaniDXgvHm2eKCVZlO8+pw4oZlnE3+an8brCParvrJ0ZCsY1u
-H8qgxEEPYdRxsKBe1jBKj0U23JNmQBw+SOqh9AAfbDA2yTzjd7HU4AqXI7SZ3QW/
-NHO33wKBgQCqxUmocyqKy5NEBPMmeHWapuSY47bdDaE139vRWV6M47oxzxF8QnQV
-1TGWsshK04QO8wsfzIa9/SjZkU17QVkz7LXbq4hPmiZjhP/H+roCeoDEyHFdkq6B
-bm/edpYemlJlQhEYtecwvD57NZbVuaqX4Culz9WdSsw4I56hD+QjHQ==
------END RSA PRIVATE KEY-----
-"

spec/spec_helper_core.rb

@@ -1,59 +0,0 @@
-ENV['RAILS_ENV'] = ENV['ENV'] = 'test'
-
-require 'simplecov' unless RUBY_ENGINE == 'jruby'
-
-RSpec.configure do |c|
-  c.before(:each) { Time.now.utc.tap { | now| Time.stubs(:now).returns(now) } }
-end
-
-require 'support'
-
-require 'travis'
-
-require 'travis/model'
-require 'travis/states_cache'
-require 'travis/testing'
-
-require 'travis/support'
-require 'travis/testing/matchers'
-
-require 'gh'
-require 'mocha/api'
-require 'stringio'
-require 'logger'
-require 'patches/rspec_hash_diff'
-
-Travis.logger = Logger.new(StringIO.new)
-Travis.services = Travis::Services
-ActionMailer::Base.delivery_method = :test
-
-include Mocha::API
-
-RSpec.configure do |c|
-  c.mock_with :mocha
-  c.alias_example_to :fit, :focused => true
-  c.filter_run :focus => true
-  c.run_all_when_everything_filtered = true
-  # c.backtrace_clean_patterns.clear
-
-  c.before :each do
-    Travis.logger.level = Logger::INFO
-    Travis::Event.instance_variable_set(:@queues, nil)
-    Travis::Event.instance_variable_set(:@subscriptions, nil)
-    Travis::Event.stubs(:subscribers).returns []
-    Travis.config.oauth2 ||= {}
-    Travis.config.oauth2.scope = 'public_repo,user'
-    Travis.config.repository.ssl_key.size = 1024
-    Travis::Github.stubs(:scopes_for).returns(['public_repo', 'user'])
-    GH.reset
-  end
-end
-
-# this keeps Model.inspect from exploding which happens for
-# expected method calls in tests that do not use a db connection
-require 'active_record'
-ActiveRecord::Base.class_eval do
-  def self.inspect
-    super
-  end
-end

spec/support/private_key.rb

@@ -0,0 +1,28 @@
+TEST_PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA6Dm1n+fc0ILeLWeiwqsWs1MZaGAfccrmpvuxfcE9UaJp2POy
+079g+mdiBgtWfnQlU84YX31rU2x9GJwnb8G6UcvkEjqczOgHHmELtaNmrRH1g8qO
+fJpzXB8XiNib1L3TDs7qYMKLDCbl2bWrcO7Dol9bSqIeb7f9rzkCd4tuXObL3pMD
+/VIW5uzeVqLBAc0Er+qw6U7clnMnHHMekXt4JSRfauSCxktR2FzigoQbJc8t4iWO
+rmNi5Q84VkXB3X7PO/eajUw+RJOl6FnPN1Zh08ceqcqmSMM4RzeVQaczXg7P92P4
+mRF41R97jIJyzUGwheb2Z4Q2rltck4V7R5BvMwIDAQABAoIBAE4O3+MRH+MiqiXe
++RGwSqAaZab08Hzic+dbIQ0hQEhJbITVXZ3ZbXKd/5ACjZ9R0R47X2vxj3rqM55r
+FsJ0/vjxrQcHlp81uvbWLgZvF1tDdyBGnOB7Vh14AgQoszCuYdxPZu8BVZXPGWG1
+tBvw1eelX91VYx+wW+BjLFYckws8kPCPY6WEnng0wQGShGqyTOJa1T4M1ethHYF+
+ddNx+fVLkEf2vL59popuJMOAyVa1jvU7D3VZ67qhlxWAvQxZeEP0vFZHeWPjvRF1
+orxiGuwLCG+Rgq1XSVJjMNf1qE3gZTlDg+u3ORKbRx2xlhiqpkHxLx7QtCmELwtD
+Dqvf8ukCgYEA/SoQwyfMp4t19FLI4tV0rp3Yn7ZSAqRtMVrLVAIQoJzDXv9BaJFS
+xb6enxRAjy+Rg10H8ijh8Z9Z3a4g3JViHQsWMrf9rL2/7M07vraIUIQoVo7yTeGa
+MXnTuKmBZFGEAM9CzqAVao1Om10TRFNLgiLAU3ZEFi8J1DYWkhzrJp0CgYEA6tOa
+V15MP3sJSlOTszshXKbwf6iXfjHbdpGUXmd9X3AMzOvl/CEGS2q46lwJISubHWKF
+BOKk1thumM4Zu6dx89hLEoXhFycgUV/KJYl54ZfhY079Ri7SZUYIqDR04BRJC2d6
+mO16Y//UwqgTaZ/lS/S791iWPTjVNEgSlRbQHA8CgYALiOEeoy+V6qrDKQpyG1un
+oRV/oWT3LdqzxvlAqJ9tUfcs2uB2DTkCPX8orFmMrJQqshBsniQ9SA9mJErnAf9o
+Z1rpkKyENFkMRwWT2Ok5EexslTLBDahi3LQi08ZLddNX3hmjJHQVWL7eIU2BbXIh
+ScgNhXPwts/x1U0N9zdXmQKBgQC4O6W2cAQQNd5XEvUpQ/XrtAmxjjq0xjbxckve
+OQFy0/0m9NiuE9bVaniDXgvHm2eKCVZlO8+pw4oZlnE3+an8brCParvrJ0ZCsY1u
+H8qgxEEPYdRxsKBe1jBKj0U23JNmQBw+SOqh9AAfbDA2yTzjd7HU4AqXI7SZ3QW/
+NHO33wKBgQCqxUmocyqKy5NEBPMmeHWapuSY47bdDaE139vRWV6M47oxzxF8QnQV
+1TGWsshK04QO8wsfzIa9/SjZkU17QVkz7LXbq4hPmiZjhP/H+roCeoDEyHFdkq6B
+bm/edpYemlJlQhEYtecwvD57NZbVuaqX4Culz9WdSsw4I56hD+QjHQ==
+-----END RSA PRIVATE KEY-----
+"

spec/support/test_helpers.rb

@@ -0,0 +1,29 @@
+require 'sinatra/test_helpers'
+
+module TestHelpers
+  include Sinatra::TestHelpers
+
+  def custom_endpoints
+    @custom_endpoints ||= []
+  end
+
+  def add_settings_endpoint(name, options = {})
+    if options[:singleton]
+      Travis::Api::App::SingletonSettingsEndpoint.subclass(name)
+    else
+      Travis::Api::App::SettingsEndpoint.subclass(name)
+    end
+    set_app Travis::Api::App.new
+  end
+
+  def add_endpoint(prefix, &block)
+    endpoint = Sinatra.new(Travis::Api::App::Endpoint, &block)
+    endpoint.set(prefix: prefix)
+    set_app Travis::Api::App.new
+    custom_endpoints << endpoint
+  end
+
+  def parsed_body
+    MultiJson.decode(body)
+  end
+end

spec/unit/access_token_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::AccessToken do
   it 'errors out on wrong type of :expires_in argument' do
     expect {

spec/unit/app_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App do
   describe :setup? do
     it 'indicates if #setup has been called' do

spec/unit/cors_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Cors do
   before do
     mock_app do

spec/unit/default_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::Endpoint::Home, set_app: true do
-
-describe Travis::Api::App::Endpoint::Home do
   describe 'GET /' do
     it 'replies with a json response by default' do
       get('/')["Content-Type"].should include("json")

spec/unit/endpoint/accounts_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::Endpoint::Accounts, set_app: true do
-
-describe Travis::Api::App::Endpoint::Accounts do
   include Travis::Testing::Stubs
   let(:access_token) { Travis::Api::App::AccessToken.create(user: user, app_id: -1) }
 

spec/unit/endpoint/authorization/user_manager_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Endpoint::Authorization::UserManager do
   let(:manager) { described_class.new(data, 'abc123') }
 

spec/unit/endpoint/authorization_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Endpoint::Authorization do
   include Travis::Testing::Stubs
 

spec/unit/endpoint/branches_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Endpoint::Branches do
   it 'has to be tested'
 end

spec/unit/endpoint/builds_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::Endpoint::Builds, set_app: true do
-
-describe Travis::Api::App::Endpoint::Builds do
   include Travis::Testing::Stubs
 
   it 'works with default options' do

spec/unit/endpoint/endpoints_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Endpoint::Endpoints do
   it 'has to be tested'
 end

spec/unit/endpoint/hooks_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Endpoint::Hooks do
   it 'has to be tested'
 end

spec/unit/endpoint/jobs_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::Endpoint::Jobs, set_app: true do
-
-describe Travis::Api::App::Endpoint::Jobs do
   let(:job) { Factory(:test) }
   let(:provider) { Factory(:annotation_provider) }
 

spec/unit/endpoint/lint_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::Endpoint::Lint, set_app: true do
-
-describe Travis::Api::App::Endpoint::Lint do
   let(:content) { "foo: bar" }
   let(:body) { "{\"lint\":{\"warnings\":[{\"key\":[],\"message\":\"unexpected key \\\"foo\\\", dropping\"},{\"key\":[],\"message\":\"missing key \\\"language\\\", defaulting to \\\"ruby\\\"\"}]}}" }
 

spec/unit/endpoint/logs_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::Endpoint::Logs, set_app: true do
-
-describe Travis::Api::App::Endpoint::Logs do
   let(:job)  { Factory(:test) }
 
   describe "GET /logs/:id/" do

spec/unit/endpoint/repos_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::Endpoint::Repos, set_app: true do
-
-describe Travis::Api::App::Endpoint::Repos do
   before do
     described_class.get('/spec/match/:id')   { "id"   }
     described_class.get('/spec/match/:name') { "name" }

spec/unit/endpoint/requests/throttle_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Services::ScheduleRequest::Throttle do
   let(:repo) { Factory(:repository) }
   subject    { described_class.new(repo.slug) }

spec/unit/endpoint/users_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::Endpoint::Users, set_app: true do
-
-describe Travis::Api::App::Endpoint::Users do
   include Travis::Testing::Stubs
   let(:access_token) { Travis::Api::App::AccessToken.create(user: user, app_id: -1) }
 

spec/unit/endpoint_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::Api::App::Endpoint, set_app: true do
-
-describe Travis::Api::App::Endpoint do
   class MyEndpoint < Travis::Api::App::Endpoint
     set :prefix, '/my_endpoint'
     get('/') { 'ok' }

spec/unit/extensions/expose_pattern_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class Foo < Sinatra::Base
   register Travis::Api::App::Extensions::ExposePattern
 

spec/unit/extensions/scoping_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Extensions::Scoping do
   include Travis::Testing::Stubs
 

spec/unit/extensions/smart_constants_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Extensions::SmartConstants do
   let(:some_app) do
     Sinatra.new { register Travis::Api::App::Extensions::SmartConstants }

spec/unit/extensions/subclass_tracker_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Extensions::SubclassTracker do
   let!(:root) { Sinatra.new { register Travis::Api::App::Extensions::SubclassTracker } }
   let!(:left) { Class.new(root) }

spec/unit/helpers/accept_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Travis::Api::App::Helpers
   describe Accept do
     class FakeApp < Struct.new(:env)

spec/unit/helpers/json_renderer_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'json'
 
 # describe Travis::Api::App::Helpers::JsonRenderer do

spec/unit/middleware/logging_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Middleware::Logging do
   it 'configures ActiveRecord' do
     ActiveRecord::Base.logger.should == Travis.logger

spec/unit/middleware/scope_check_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Middleware::ScopeCheck do
   include Travis::Testing::Stubs
 

spec/unit/middleware/user_agent_tracker_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Middleware::UserAgentTracker do
   before do
     mock_app do

spec/unit/responders/json_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Travis::Api::App::Responders
   describe Json do
     class MyJson < Json

spec/unit/responders/service_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::App::Responders::Service do
   class MyService < Travis::Api::App::Responders::Service
   end

spec/unit/serialize/v2/http/accounts_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Accounts do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/annotations_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Annotations do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/branch_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Branch do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/branches_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Branches do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/broadcasts_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Broadcasts do
   include Support::Formats
 

spec/unit/serialize/v2/http/build_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Build do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/builds_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Builds do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/caches_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Caches do
   include Travis::Testing::Stubs, Support::Formats
   let(:data) { described_class.new([cache]).data }

spec/unit/serialize/v2/http/env_var_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::EnvVar do
   let(:env_var) { Repository::Settings::EnvVar.new(name: 'FOO', value: 'bar', public: true) }
   let(:data) { described_class.new(env_var) }

spec/unit/serialize/v2/http/hooks_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Hooks do
   include Travis::Testing::Stubs
 

spec/unit/serialize/v2/http/job_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Job do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/jobs_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Jobs do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/log_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Log do
   include Travis::Testing::Stubs
 

spec/unit/serialize/v2/http/permissions_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Permissions do
   include Travis::Testing::Stubs
 

spec/unit/serialize/v2/http/repositories_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Repositories do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/repository_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Repository do
   include Travis::Testing::Stubs
   include Support::Formats

spec/unit/serialize/v2/http/request_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Request do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/requests_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::Requests do
   include Travis::Testing::Stubs, Support::Formats
 

spec/unit/serialize/v2/http/ssl_key_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::SslKey do
   include Travis::Testing::Stubs
   include Support::Formats

spec/unit/serialize/v2/http/user_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::Api::Serialize::V2::Http::User do
   include Travis::Testing::Stubs, Support::Formats
 

spec/v3/error_handling_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::ServiceIndex, set_app: true do
-
-describe Travis::API::V3::ServiceIndex do
   let(:headers) {{  }}
   let(:path)      { "/v3/repo/1/enable"         }
   let(:json)      { JSON.load(response.body) }

spec/v3/extensions/belongs_to_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::API::V3::Extensions::BelongsTo do
   describe 'reading polymorphic relation' do
     subject(:repo) { Travis::API::V3::Models::Repository.first }

spec/v3/metrics_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::API::V3::Metrics do
   class TestProcessor
     attr_reader :times, :marks, :queue

spec/v3/models/cron_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'timecop'
 
 describe Travis::API::V3::Models::Cron do

spec/v3/queries/cron_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::API::V3::Queries::Crons do
   let(:user) { Travis::API::V3::Models::User.find_by_login('svenfuchs') }
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }

spec/v3/renderer/avatar_url_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::API::V3::Renderer::AvatarURL do
   let(:object) { Object.new }
   subject { Travis::API::V3::Renderer::AvatarURL.avatar_url(object) }

spec/v3/result_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Travis::API::V3::Result do
   let(:access_control) { Object.new }
   subject(:result) { described_class.new(access_control, :example, []) }

spec/v3/service_index_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::ServiceIndex, set_app: true do
-
-describe Travis::API::V3::ServiceIndex do
   let(:headers)   {{                        }}
   let(:path)      { '/'                      }
   let(:json)      { JSON.load(response.body) }

spec/v3/services/accounts/for_current_user_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Accounts::ForCurrentUser, set_app: true do
-
-describe Travis::API::V3::Services::Accounts::ForCurrentUser do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
 
   let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }

spec/v3/services/branch/find_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Repository::Find, set_app: true do
-
-describe Travis::API::V3::Services::Repository::Find do
   let(:repo)  { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:build) { repo.builds.first }
   let(:jobs)  { Travis::API::V3::Models::Build.find(build.id).jobs }

spec/v3/services/branches/find_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Branches::Find, set_app: true do
-
-describe Travis::API::V3::Services::Branches::Find do
   let(:repo)   { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:branch) { Travis::API::V3::Models::Branch.where(repository_id: repo.id).first }
   let(:build)  { branch.last_build }

spec/v3/services/broadcasts/for_current_user_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Broadcasts::ForCurrentUser, set_app: true do
-
-describe Travis::API::V3::Services::Broadcasts::ForCurrentUser do
   let(:repo)    { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
   let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}

spec/v3/services/build/cancel_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Build::Cancel, set_app: true do
-
-describe Travis::API::V3::Services::Build::Cancel do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:build) { repo.builds.first }
   let(:sidekiq_payload) { JSON.load(Sidekiq::Client.last['args'].last.to_json) }

spec/v3/services/build/find_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Build::Find, set_app: true do
-
-describe Travis::API::V3::Services::Build::Find do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:build) { repo.builds.first }
   let(:jobs)  { Travis::API::V3::Models::Build.find(build.id).jobs }

spec/v3/services/build/restart_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Build::Restart, set_app: true do
-
-describe Travis::API::V3::Services::Build::Restart do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:build) { repo.builds.first }
   let(:sidekiq_payload) { JSON.load(Sidekiq::Client.last['args'].last.to_json) }

spec/v3/services/builds/find_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Builds::Find, set_app: true do
-
-describe Travis::API::V3::Services::Builds::Find do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:build) { repo.builds.first }
   let(:jobs)  { Travis::API::V3::Models::Build.find(build.id).jobs }

spec/v3/services/cron/create_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Cron::Create, set_app: true do
-
-describe Travis::API::V3::Services::Cron::Create do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:branch) { Travis::API::V3::Models::Branch.where(repository_id: repo).first }
   let(:non_existing_branch) { Travis::API::V3::Models::Branch.create(repository: repo, name: 'cron-test', exists_on_github: false) }

spec/v3/services/cron/delete_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Cron::Delete, set_app: true do
-
-describe Travis::API::V3::Services::Cron::Delete do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:branch) { Travis::API::V3::Models::Branch.where(repository_id: repo).first }
   let(:cron)  { Travis::API::V3::Models::Cron.create(branch: branch, interval:'daily') }

spec/v3/services/cron/find_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Cron::Find, set_app: true do
-
-describe Travis::API::V3::Services::Cron::Find do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:branch) { Travis::API::V3::Models::Branch.where(repository_id: repo).first }
   let(:cron)  { Travis::API::V3::Models::Cron.create(branch: branch, interval:'daily') }

spec/v3/services/cron/for_branch_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Cron::ForBranch, set_app: true do
-
-describe Travis::API::V3::Services::Cron::ForBranch do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:branch) { Travis::API::V3::Models::Branch.where(repository_id: repo).first }
   let(:cron)  { Travis::API::V3::Models::Cron.create(branch: branch, interval:'daily') }

spec/v3/services/crons/for_repository_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Crons::ForRepository, set_app: true do
-
-describe Travis::API::V3::Services::Crons::ForRepository do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:branch) { Travis::API::V3::Models::Branch.where(repository_id: repo).first }
   let(:cron)  { Travis::API::V3::Models::Cron.create(branch: branch, interval:'daily') }

spec/v3/services/job/cancel_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Job::Cancel, set_app: true do
-
-describe Travis::API::V3::Services::Job::Cancel do
   let(:repo)  { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:build) { repo.builds.first }
   let(:job)   { build.jobs.first}

spec/v3/services/job/debug_sepc.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
+describe Travis::API::V3::Services::Job::Debug, set_app: true do
-
-describe Travis::API::V3::Services::Job::Debug do
   let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:owner_type)  { repo.owner_type.constantize }
   let(:owner)       { owner_type.find(repo.owner_id)}