aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-05-25 00:07:38 +0100
committerJon Leighton <j@jonathanleighton.com>2011-05-25 00:08:14 +0100
commitc69111ba5fde8445237f682c88b927bcde1588d4 (patch)
tree4f29767a8b0c45352b2383f5bce497d582d8e98a /activerecord/test/cases
parentd21fef324b5270e9e3c255d278974a15a34b118a (diff)
downloadrails-c69111ba5fde8445237f682c88b927bcde1588d4.tar.gz
rails-c69111ba5fde8445237f682c88b927bcde1588d4.tar.bz2
rails-c69111ba5fde8445237f682c88b927bcde1588d4.zip
Fix infinite recursion where a lazy default scope references a scope. Fixes #1264.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/relation_scoping_test.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index c215602567..8f8e72f052 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -312,6 +312,14 @@ class DefaultScopingTest < ActiveRecord::TestCase
assert_equal [developers(:david).becomes(ClassMethodDeveloperCalledDavid)], ClassMethodDeveloperCalledDavid.all
end
+ def test_default_scope_as_class_method_referencing_scope
+ assert_equal [developers(:david).becomes(ClassMethodReferencingScopeDeveloperCalledDavid)], ClassMethodReferencingScopeDeveloperCalledDavid.all
+ end
+
+ def test_default_scope_as_block_referencing_scope
+ assert_equal [developers(:david).becomes(LazyBlockReferencingScopeDeveloperCalledDavid)], LazyBlockReferencingScopeDeveloperCalledDavid.all
+ end
+
def test_default_scope_with_lambda
assert_equal [developers(:david).becomes(LazyLambdaDeveloperCalledDavid)], LazyLambdaDeveloperCalledDavid.all
end