diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-03 22:38:27 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-03 22:38:27 -0700 |
| commit | 53bcbfbdc1eed45cc6615e59d36baf018ab43d96 (patch) | |
| tree | 691441d50ef7e49b5317ce279329bcaa1d135744 /activerecord/test/cases/inheritance_test.rb | |
| parent | f55ad960d22337d0d92a93724f1cc3ad45200836 (diff) | |
| parent | 82e96eb294ae21528c3e05e91c05c7ee5222afbd (diff) | |
| download | rails-53bcbfbdc1eed45cc6615e59d36baf018ab43d96.tar.gz rails-53bcbfbdc1eed45cc6615e59d36baf018ab43d96.tar.bz2 rails-53bcbfbdc1eed45cc6615e59d36baf018ab43d96.zip | |
Merge branch 'master' into erbout
Diffstat (limited to 'activerecord/test/cases/inheritance_test.rb')
| -rwxr-xr-x | activerecord/test/cases/inheritance_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index f09b617e6d..47fb5c608f 100755 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -223,11 +223,11 @@ class InheritanceComputeTypeTest < ActiveRecord::TestCase fixtures :companies def setup - Dependencies.log_activity = true + ActiveSupport::Dependencies.log_activity = true end def teardown - Dependencies.log_activity = false + ActiveSupport::Dependencies.log_activity = false self.class.const_remove :FirmOnTheFly rescue nil Firm.const_remove :FirmOnTheFly rescue nil end |