Merge branch 'master' of git://github.com/rails/rails

1 files changed, 3 insertions, 3 deletions

diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 1e2093273e..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,12 +522,12 @@ 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
     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 = []