diff options
| author | wangjohn <wangjohn@mit.edu> | 2013-04-09 19:20:49 -0400 |
|---|---|---|
| committer | wangjohn <wangjohn@mit.edu> | 2013-04-09 22:27:32 -0400 |
| commit | e12901e4235d1ece2a17c5419f4420f1931cc6a4 (patch) | |
| tree | 5bcd2ef9f09cc031f54f9475ec28c9f0e6b4c4e1 /activerecord/test/cases/base_test.rb | |
| parent | 95ac3913ee24efa1c5a9789963697aaa6e5b32b7 (diff) | |
| download | rails-e12901e4235d1ece2a17c5419f4420f1931cc6a4.tar.gz rails-e12901e4235d1ece2a17c5419f4420f1931cc6a4.tar.bz2 rails-e12901e4235d1ece2a17c5419f4420f1931cc6a4.zip | |
Changed the ScopeRegistry and the InstrumentationRegistry to use the
PerThreadRegistry module.
Diffstat (limited to 'activerecord/test/cases/base_test.rb')
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index e57dbd5a09..83fc0b48f9 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1377,9 +1377,9 @@ class BasicsTest < ActiveRecord::TestCase UnloadablePost.send(:current_scope=, UnloadablePost.all) UnloadablePost.unloadable - assert_not_nil ActiveRecord::Scoping::ScopeRegistry.current.value_for(:current_scope, "UnloadablePost") + assert_not_nil ActiveRecord::Scoping::ScopeRegistry.instance.value_for(:current_scope, "UnloadablePost") ActiveSupport::Dependencies.remove_unloadable_constants! - assert_nil ActiveRecord::Scoping::ScopeRegistry.current.value_for(:current_scope, "UnloadablePost") + assert_nil ActiveRecord::Scoping::ScopeRegistry.instance.value_for(:current_scope, "UnloadablePost") ensure Object.class_eval{ remove_const :UnloadablePost } if defined?(UnloadablePost) end |