diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-04-09 21:27:48 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-04-09 21:27:48 -0700 |
| commit | e0af93dd3a5eeee2e2a67b05f34afb66cc80c00b (patch) | |
| tree | 5bcd2ef9f09cc031f54f9475ec28c9f0e6b4c4e1 /activerecord/test | |
| parent | 9039c5038823754f79e04f1e83723e46229dbe05 (diff) | |
| parent | e12901e4235d1ece2a17c5419f4420f1931cc6a4 (diff) | |
| download | rails-e0af93dd3a5eeee2e2a67b05f34afb66cc80c00b.tar.gz rails-e0af93dd3a5eeee2e2a67b05f34afb66cc80c00b.tar.bz2 rails-e0af93dd3a5eeee2e2a67b05f34afb66cc80c00b.zip | |
Merge pull request #10156 from wangjohn/grouping_thread_locals
Grouping thread locals in ActiveRecord
Diffstat (limited to 'activerecord/test')
| -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 |