From 665ef116ac9000d514c03fc61b216513f5cb7b25 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Wed, 14 Dec 2011 11:11:12 +0000 Subject: Add return for 1.8.7 --- activerecord/test/cases/relation_scoping_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/test/cases/relation_scoping_test.rb') diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb index 1e2093273e..c7f6ab60ef 100644 --- a/activerecord/test/cases/relation_scoping_test.rb +++ b/activerecord/test/cases/relation_scoping_test.rb @@ -527,7 +527,7 @@ class DefaultScopingTest < ActiveRecord::TestCase def test_default_scope_is_threadsafe if in_memory_db? - skip "in memory db can't share a db between threads" + return skip "in memory db can't share a db between threads" end threads = [] -- cgit v1.2.3 From c99d507fccca2e9e4d12e49b4387e007c5481ae9 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Thu, 29 Dec 2011 14:26:38 +0000 Subject: Deprecate implicit eager loading. Closes #950. --- activerecord/test/cases/relation_scoping_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/test/cases/relation_scoping_test.rb') diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb index c7f6ab60ef..8b4638b161 100644 --- a/activerecord/test/cases/relation_scoping_test.rb +++ b/activerecord/test/cases/relation_scoping_test.rb @@ -105,7 +105,7 @@ class RelationScopingTest < ActiveRecord::TestCase def test_scoped_find_include # with the include, will retrieve only developers for the given project - scoped_developers = Developer.includes(:projects).scoping do + scoped_developers = Developer.eager_load(:projects).scoping do Developer.where('projects.id = 2').all end assert scoped_developers.include?(developers(:david)) @@ -522,7 +522,7 @@ class DefaultScopingTest < ActiveRecord::TestCase d = DeveloperWithIncludes.create! d.audit_logs.create! :message => 'foo' - assert_equal 1, DeveloperWithIncludes.where(:audit_logs => { :message => 'foo' }).count + assert_equal 1, DeveloperWithIncludes.eager_load(:audit_logs).where(:audit_logs => { :message => 'foo' }).count end def test_default_scope_is_threadsafe -- cgit v1.2.3