updates for v3 approved by rkh and spruce up the model tests

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

spec/core/model/annotation_provider_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe AnnotationProvider do
   include Support::ActiveRecord

spec/core/model/annotation_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Annotation do
   include Support::ActiveRecord

spec/core/model/broadcast_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Broadcast do
   include Support::ActiveRecord

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

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

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

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

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

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

spec/core/model/build/metrics_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 class BuildMetricsMock
   include do

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)

spec/core/model/build/states_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 class BuildMock
   include Build::States

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

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

spec/core/model/commit_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Commit do
   include Support::ActiveRecord

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

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

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)

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

spec/core/model/job_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Job do
   include Support::ActiveRecord

spec/core/model/organization_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe User do
   include Support::ActiveRecord

spec/core/model/permission_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Permission do
   include Support::ActiveRecord

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) {

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

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

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

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

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

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

spec/core/model/request_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Request do
   include Support::ActiveRecord

spec/core/model/ssl_key_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe SslKey do
   include Support::ActiveRecord

spec/core/model/token_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Token do
   include Support::ActiveRecord

spec/core/model/url_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_core'
+require 'spec_helper'
 
 describe Url do
   include Support::ActiveRecord

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

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

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)

spec/spec_helper_core.rb

@@ -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

spec/support/active_record.rb

@@ -22,12 +22,9 @@ module Support
 
     included do
       before :each, truncation: true do
+        DatabaseCleaner.clean
         DatabaseCleaner.strategy = :truncation
       end
-
-      after :each do
-        DatabaseCleaner.clean
-      end
     end
   end
 end

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