spec/spec_helper.rb in timber-1.1.14 vs spec/spec_helper.rb in timber-2.0.0

@@ -1,26 +1,23 @@
 # Base
 require 'rubygems'
 require 'bundler/setup'
 
 # Testing
-require 'pry'
 require 'rspec'
 require 'rspec/its'
 require 'rspec/mocks'
 
 # Support files, order is relevant
-require File.join(File.dirname(__FILE__), 'support', 'coveralls')
 require File.join(File.dirname(__FILE__), 'support', 'socket_hostname')
-require File.join(File.dirname(__FILE__), 'support', 'simplecov')
 require File.join(File.dirname(__FILE__), 'support', 'timecop')
 require File.join(File.dirname(__FILE__), 'support', 'webmock')
 require File.join(File.dirname(__FILE__), 'support', 'timber')
 
+# Load framework files after we've setup everything
 if !ENV["RAILS_23"]
   require File.join(File.dirname(__FILE__), 'support', 'rails')
   require File.join(File.dirname(__FILE__), 'support', 'action_controller')
-  require File.join(File.dirname(__FILE__), 'support', 'action_view')
   require File.join(File.dirname(__FILE__), 'support', 'active_record')
 end
 
 RSpec.configure do |config|
   config.color = true