fix test

[pettanr/pettanr.git] / spec / spec_helper.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c0569b6..fb8d32b 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,8 +2,7 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
-require File.dirname(__FILE__) + '/controller_helper'
+require File.dirname(__FILE__) + '/support/controller_macros'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -11,6 +10,7 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 Dir.glob(File.dirname(__FILE__) + '/factories/*.rb').each {|f| require f }
 
 RSpec.configure do |config|
+  config.deprecation_stream = File.open(File.dirname(__FILE__) + '/deprecations.txt', 'w')
   # == Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line: