From 9ed43941fdd7e0528cd0d5246e1b2daa86466b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Hendricksen?= <renee@travis-ci.org>
Date: Wed, 25 May 2016 19:30:56 +0200
Subject: [PATCH] updates for v3 approved by rkh and spruce up the model tests

---
 lib/travis/api/v3/result.rb                   |  7 +--
 spec/core/model/annotation_provider_spec.rb   |  2 +-
 spec/core/model/annotation_spec.rb            |  2 +-
 spec/core/model/broadcast_spec.rb             |  2 +-
 spec/core/model/build/compat_spec.rb          |  2 +-
 spec/core/model/build/config/matrix_spec.rb   |  2 +-
 .../core/model/build/config/obfuscate_spec.rb |  2 +-
 spec/core/model/build/config_spec.rb          |  2 +-
 spec/core/model/build/denormalize_spec.rb     |  2 +-
 spec/core/model/build/matrix_spec.rb          |  2 +-
 spec/core/model/build/metrics_spec.rb         |  2 +-
 spec/core/model/build/result_message_spec.rb  |  2 +-
 spec/core/model/build/states_spec.rb          |  2 +-
 spec/core/model/build/update_branch_spec.rb   |  2 +-
 spec/core/model/build_spec.rb                 |  2 +-
 spec/core/model/commit_spec.rb                |  2 +-
 spec/core/model/encrypted_column_spec.rb      |  2 +-
 spec/core/model/job/cleanup_spec.rb           |  2 +-
 spec/core/model/job/queue_spec.rb             |  2 +-
 spec/core/model/job/test_spec.rb              |  2 +-
 spec/core/model/job_spec.rb                   |  2 +-
 spec/core/model/organization_spec.rb          |  2 +-
 spec/core/model/permission_spec.rb            |  2 +-
 .../model/repository/settings/ssh_key_spec.rb |  2 +-
 spec/core/model/repository/settings_spec.rb   |  2 +-
 .../model/repository/status_image_spec.rb     |  2 +-
 spec/core/model/repository_spec.rb            |  2 +-
 spec/core/model/request/approval_spec.rb      |  2 +-
 spec/core/model/request/branches_spec.rb      |  2 +-
 spec/core/model/request/states_spec.rb        |  2 +-
 spec/core/model/request_spec.rb               |  2 +-
 spec/core/model/ssl_key_spec.rb               |  2 +-
 spec/core/model/token_spec.rb                 |  2 +-
 spec/core/model/url_spec.rb                   |  2 +-
 spec/core/model/user/oauth_spec.rb            |  2 +-
 spec/core/model/user_spec.rb                  |  2 +-
 spec/spec_helper.rb                           |  1 +
 spec/spec_helper_core.rb                      | 58 -------------------
 spec/support/active_record.rb                 |  5 +-
 spec/v3/result_spec.rb                        |  7 +--
 40 files changed, 39 insertions(+), 109 deletions(-)
 delete mode 100644 spec/spec_helper_core.rb

diff --git a/lib/travis/api/v3/result.rb b/lib/travis/api/v3/result.rb
index c6875af1..42a6c727 100644
--- a/lib/travis/api/v3/result.rb
+++ b/lib/travis/api/v3/result.rb
@@ -2,7 +2,7 @@ module Travis::API::V3
   class Result
     attr_accessor :access_control, :type, :resource, :status, :href, :meta_data, :warnings
 
-    def initialize(access_control, type, resource = [], status: 200, **meta_data)
+    def initialize(access_control, type, resource, status: 200, **meta_data)
       @warnings = []
       @access_control, @type, @resource, @status, @meta_data = access_control, type, resource, status, meta_data
     end
@@ -20,11 +20,6 @@ module Travis::API::V3
       warn(message, warning_type: :ignored_parameter, parameter: param, **info)
     end
 
-    def <<(value)
-      resource << value
-      self
-    end
-
     def render(params, env)
       href    = self.href
       href    = V3.location(env) if href.nil? and env['REQUEST_METHOD'.freeze] == 'GET'.freeze
diff --git a/spec/core/model/annotation_provider_spec.rb b/spec/core/model/annotation_provider_spec.rb
index 4ada52ea..f49d5d90 100644
--- a/spec/core/model/annotation_provider_spec.rb
+++ b/spec/core/model/annotation_provider_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe AnnotationProvider do
   include Support::ActiveRecord
diff --git a/spec/core/model/annotation_spec.rb b/spec/core/model/annotation_spec.rb
index 1850a6d3..773faee2 100644
--- a/spec/core/model/annotation_spec.rb
+++ b/spec/core/model/annotation_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Annotation do
   include Support::ActiveRecord
diff --git a/spec/core/model/broadcast_spec.rb b/spec/core/model/broadcast_spec.rb
index a3480e05..67c4c63b 100644
--- a/spec/core/model/broadcast_spec.rb
+++ b/spec/core/model/broadcast_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Broadcast do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/compat_spec.rb b/spec/core/model/build/compat_spec.rb
index 3e5495e2..ce04d0a1 100644
--- a/spec/core/model/build/compat_spec.rb
+++ b/spec/core/model/build/compat_spec.rb
@@ -1,4 +1,4 @@
-# require 'spec_helper_core'
+# require 'spec_helper'
 #
 # describe Build::Compat do
 #   include Support::ActiveRecord
diff --git a/spec/core/model/build/config/matrix_spec.rb b/spec/core/model/build/config/matrix_spec.rb
index f2ced0e5..824dd89b 100644
--- a/spec/core/model/build/config/matrix_spec.rb
+++ b/spec/core/model/build/config/matrix_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 require 'core_ext/hash/deep_symbolize_keys'
 
 describe Build::Config::Matrix do
diff --git a/spec/core/model/build/config/obfuscate_spec.rb b/spec/core/model/build/config/obfuscate_spec.rb
index 838de065..99b4d094 100644
--- a/spec/core/model/build/config/obfuscate_spec.rb
+++ b/spec/core/model/build/config/obfuscate_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Build::Config::Obfuscate do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/config_spec.rb b/spec/core/model/build/config_spec.rb
index 708786a8..583da9cf 100644
--- a/spec/core/model/build/config_spec.rb
+++ b/spec/core/model/build/config_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Build::Config do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/denormalize_spec.rb b/spec/core/model/build/denormalize_spec.rb
index 0077bb40..f77983c0 100644
--- a/spec/core/model/build/denormalize_spec.rb
+++ b/spec/core/model/build/denormalize_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Build, 'denormalization' do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/matrix_spec.rb b/spec/core/model/build/matrix_spec.rb
index 55efab40..b83ff48b 100644
--- a/spec/core/model/build/matrix_spec.rb
+++ b/spec/core/model/build/matrix_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Build, 'matrix' do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/metrics_spec.rb b/spec/core/model/build/metrics_spec.rb
index cc9b8769..3defa151 100644
--- a/spec/core/model/build/metrics_spec.rb
+++ b/spec/core/model/build/metrics_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 class BuildMetricsMock
   include do
diff --git a/spec/core/model/build/result_message_spec.rb b/spec/core/model/build/result_message_spec.rb
index 40b22021..80592dda 100644
--- a/spec/core/model/build/result_message_spec.rb
+++ b/spec/core/model/build/result_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Build::ResultMessage do
   def message(data)
diff --git a/spec/core/model/build/states_spec.rb b/spec/core/model/build/states_spec.rb
index abe2995c..1d5bdbbb 100644
--- a/spec/core/model/build/states_spec.rb
+++ b/spec/core/model/build/states_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 class BuildMock
   include Build::States
diff --git a/spec/core/model/build/update_branch_spec.rb b/spec/core/model/build/update_branch_spec.rb
index 4a5c0a8e..dc0a3ee6 100644
--- a/spec/core/model/build/update_branch_spec.rb
+++ b/spec/core/model/build/update_branch_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Build::UpdateBranch, truncation: true do
   include Support::ActiveRecord
diff --git a/spec/core/model/build_spec.rb b/spec/core/model/build_spec.rb
index e4827319..508b895b 100644
--- a/spec/core/model/build_spec.rb
+++ b/spec/core/model/build_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Build, truncation: true do
   include Support::ActiveRecord
diff --git a/spec/core/model/commit_spec.rb b/spec/core/model/commit_spec.rb
index a126421f..7fc1ed01 100644
--- a/spec/core/model/commit_spec.rb
+++ b/spec/core/model/commit_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Commit do
   include Support::ActiveRecord
diff --git a/spec/core/model/encrypted_column_spec.rb b/spec/core/model/encrypted_column_spec.rb
index cd27635d..e1c92261 100644
--- a/spec/core/model/encrypted_column_spec.rb
+++ b/spec/core/model/encrypted_column_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 class Travis::Model < ActiveRecord::Base
   describe EncryptedColumn do
diff --git a/spec/core/model/job/cleanup_spec.rb b/spec/core/model/job/cleanup_spec.rb
index 572e9da7..59a43b0c 100644
--- a/spec/core/model/job/cleanup_spec.rb
+++ b/spec/core/model/job/cleanup_spec.rb
@@ -1,4 +1,4 @@
-# require 'spec_helper_core'
+# require 'spec_helper'
 #
 # describe Job::Cleanup do
 #   include Support::ActiveRecord
diff --git a/spec/core/model/job/queue_spec.rb b/spec/core/model/job/queue_spec.rb
index 6036f3e8..17f958f3 100644
--- a/spec/core/model/job/queue_spec.rb
+++ b/spec/core/model/job/queue_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe 'Job::Queue' do
   def queue(*args)
diff --git a/spec/core/model/job/test_spec.rb b/spec/core/model/job/test_spec.rb
index c2ebdadf..a9d18a28 100644
--- a/spec/core/model/job/test_spec.rb
+++ b/spec/core/model/job/test_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Job::Test do
   include Support::ActiveRecord
diff --git a/spec/core/model/job_spec.rb b/spec/core/model/job_spec.rb
index 88a62c3e..8a3b18d5 100644
--- a/spec/core/model/job_spec.rb
+++ b/spec/core/model/job_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Job do
   include Support::ActiveRecord
diff --git a/spec/core/model/organization_spec.rb b/spec/core/model/organization_spec.rb
index 9920d539..54b3db09 100644
--- a/spec/core/model/organization_spec.rb
+++ b/spec/core/model/organization_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe User do
   include Support::ActiveRecord
diff --git a/spec/core/model/permission_spec.rb b/spec/core/model/permission_spec.rb
index 2b475840..da9dcdc5 100644
--- a/spec/core/model/permission_spec.rb
+++ b/spec/core/model/permission_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Permission do
   include Support::ActiveRecord
diff --git a/spec/core/model/repository/settings/ssh_key_spec.rb b/spec/core/model/repository/settings/ssh_key_spec.rb
index d2739643..40a5b829 100644
--- a/spec/core/model/repository/settings/ssh_key_spec.rb
+++ b/spec/core/model/repository/settings/ssh_key_spec.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Repository::Settings::SshKey do
   let(:private_key) {
diff --git a/spec/core/model/repository/settings_spec.rb b/spec/core/model/repository/settings_spec.rb
index 6ff7acd4..d727d213 100644
--- a/spec/core/model/repository/settings_spec.rb
+++ b/spec/core/model/repository/settings_spec.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Repository::Settings do
   describe 'env_vars' do
diff --git a/spec/core/model/repository/status_image_spec.rb b/spec/core/model/repository/status_image_spec.rb
index 1c166cae..e2d9cdf0 100644
--- a/spec/core/model/repository/status_image_spec.rb
+++ b/spec/core/model/repository/status_image_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Repository::StatusImage do
   include Support::ActiveRecord
diff --git a/spec/core/model/repository_spec.rb b/spec/core/model/repository_spec.rb
index 0ce140ab..23a5b3bd 100644
--- a/spec/core/model/repository_spec.rb
+++ b/spec/core/model/repository_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Repository, truncation: true do
   include Support::ActiveRecord
diff --git a/spec/core/model/request/approval_spec.rb b/spec/core/model/request/approval_spec.rb
index 6b8a6e7f..8a591b3e 100644
--- a/spec/core/model/request/approval_spec.rb
+++ b/spec/core/model/request/approval_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Request::Approval do
   include Travis::Testing::Stubs
diff --git a/spec/core/model/request/branches_spec.rb b/spec/core/model/request/branches_spec.rb
index 05306818..72c6cf50 100644
--- a/spec/core/model/request/branches_spec.rb
+++ b/spec/core/model/request/branches_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Request::Branches do
   include Travis::Testing::Stubs
diff --git a/spec/core/model/request/states_spec.rb b/spec/core/model/request/states_spec.rb
index 6cc708c8..3d731189 100644
--- a/spec/core/model/request/states_spec.rb
+++ b/spec/core/model/request/states_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Request::States do
   include Support::ActiveRecord
diff --git a/spec/core/model/request_spec.rb b/spec/core/model/request_spec.rb
index 4e06e832..41045ee4 100644
--- a/spec/core/model/request_spec.rb
+++ b/spec/core/model/request_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Request do
   include Support::ActiveRecord
diff --git a/spec/core/model/ssl_key_spec.rb b/spec/core/model/ssl_key_spec.rb
index a621e301..83240051 100644
--- a/spec/core/model/ssl_key_spec.rb
+++ b/spec/core/model/ssl_key_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe SslKey do
   include Support::ActiveRecord
diff --git a/spec/core/model/token_spec.rb b/spec/core/model/token_spec.rb
index 3bdd17ac..08aee799 100644
--- a/spec/core/model/token_spec.rb
+++ b/spec/core/model/token_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Token do
   include Support::ActiveRecord
diff --git a/spec/core/model/url_spec.rb b/spec/core/model/url_spec.rb
index 9001ab4f..094deadf 100644
--- a/spec/core/model/url_spec.rb
+++ b/spec/core/model/url_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Url do
   include Support::ActiveRecord
diff --git a/spec/core/model/user/oauth_spec.rb b/spec/core/model/user/oauth_spec.rb
index 39920520..c8ddfd48 100644
--- a/spec/core/model/user/oauth_spec.rb
+++ b/spec/core/model/user/oauth_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe User::Oauth do
   include Support::ActiveRecord
diff --git a/spec/core/model/user_spec.rb b/spec/core/model/user_spec.rb
index 1375c28f..6e4dad45 100644
--- a/spec/core/model/user_spec.rb
+++ b/spec/core/model/user_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe User, truncation: true do
   include Support::ActiveRecord
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c7e1dfc3..819dcfb7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -18,6 +18,7 @@ require 'travis/testing/matchers'
 require 'support'
 require 'support/matchers'
 require 'support/formats'
+require 'pry'
 
 
 Travis.logger = Logger.new(StringIO.new)
diff --git a/spec/spec_helper_core.rb b/spec/spec_helper_core.rb
deleted file mode 100644
index 9405df9d..00000000
--- a/spec/spec_helper_core.rb
+++ /dev/null
@@ -1,58 +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 'stringio'
-require 'logger'
-require 'patches/rspec_hash_diff'
-require 'database_cleaner'
-
-Travis.logger = Logger.new(StringIO.new)
-Travis.services = Travis::Services
-ActionMailer::Base.delivery_method = :test
-
-RSpec.configure do |c|
-  c.mock_with :mocha
-  c.alias_example_to :fit, :focused => true
-  c.filter_run :focused => true
-  c.run_all_when_everything_filtered = true
- # c.backtrace_clean_patterns.clear
-
-  c.before :each do
-    DatabaseCleaner.strategy = :transaction
-    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
diff --git a/spec/support/active_record.rb b/spec/support/active_record.rb
index b87add63..de861fcb 100644
--- a/spec/support/active_record.rb
+++ b/spec/support/active_record.rb
@@ -22,11 +22,8 @@ module Support
 
     included do
       before :each, truncation: true do
-        DatabaseCleaner.strategy = :truncation
-      end
-
-      after :each do
         DatabaseCleaner.clean
+        DatabaseCleaner.strategy = :truncation
       end
     end
   end
diff --git a/spec/v3/result_spec.rb b/spec/v3/result_spec.rb
index 3dd75885..360d686c 100644
--- a/spec/v3/result_spec.rb
+++ b/spec/v3/result_spec.rb
@@ -2,15 +2,10 @@ require 'spec_helper'
 
 describe Travis::API::V3::Result do
   let(:access_control) { Object.new }
-  subject(:result) { described_class.new(access_control, :example) }
+  subject(:result) { described_class.new(access_control, :example, []) }
 
   example { expect(result.type)           .to be == :example       }
   example { expect(result.resource)       .to be == []             }
   example { expect(result.example)        .to be == []             }
   example { expect(result.access_control) .to be == access_control }
-
-  example do
-    result << 42
-    expect(result.example).to include(42)
-  end
 end