diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-08 10:23:39 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-08 10:23:39 -0700 |
| commit | e2e9eed3dc6205ec0f9925a8c452067fae9a552d (patch) | |
| tree | 7f843c6e3005202756bd2eea01c5f36f84623552 /activerecord/test | |
| parent | 63f7356b3ae5d5f9a0710e52f6392bdcd269d903 (diff) | |
| parent | 5b945f2685bf9ec77ddf0d79d09f0000d827cd22 (diff) | |
| download | rails-e2e9eed3dc6205ec0f9925a8c452067fae9a552d.tar.gz rails-e2e9eed3dc6205ec0f9925a8c452067fae9a552d.tar.bz2 rails-e2e9eed3dc6205ec0f9925a8c452067fae9a552d.zip | |
Merge pull request #10135 from wangjohn/grouping_thread_locals
Grouping thread locals in the ActiveRecord scopes
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 acf003bd80..e57dbd5a09 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 Thread.current[:UnloadablePost_current_scope] + assert_not_nil ActiveRecord::Scoping::ScopeRegistry.current.value_for(:current_scope, "UnloadablePost") ActiveSupport::Dependencies.remove_unloadable_constants! - assert_nil Thread.current[:UnloadablePost_current_scope] + assert_nil ActiveRecord::Scoping::ScopeRegistry.current.value_for(:current_scope, "UnloadablePost") ensure Object.class_eval{ remove_const :UnloadablePost } if defined?(UnloadablePost) end |