aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-02 21:34:44 +0200
committerXavier Noria <fxn@hashref.com>2012-08-02 21:59:23 +0200
commit077372b20d1024eace791af27792b71c0b7ccdb9 (patch)
treea7266126556e40aee03257b54086a206c5279b21 /activerecord/test/cases
parent4aee8dd486828943fb414504500efdbcfb49f884 (diff)
downloadrails-077372b20d1024eace791af27792b71c0b7ccdb9.tar.gz
rails-077372b20d1024eace791af27792b71c0b7ccdb9.tar.bz2
rails-077372b20d1024eace791af27792b71c0b7ccdb9.zip
load active_support/deprecation in active_support/rails
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/helper.rb2
-rw-r--r--activerecord/test/cases/test_case.rb1
2 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 44d08a8ee4..018064233a 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -6,8 +6,8 @@ gem 'minitest'
require 'minitest/autorun'
require 'stringio'
-require 'cases/test_case'
require 'active_record'
+require 'cases/test_case'
require 'active_support/dependencies'
require 'active_support/logger'
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index 94a13d386c..f3f7054794 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
ActiveSupport::Deprecation.silence do
require 'active_record/test_case'
end