aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/method_scoping_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-23 22:53:26 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-23 22:53:26 +0100
commitf915f9e33903ee474920e24ad12a1625f2ef1c52 (patch)
tree5b6d41e8a809aeaadbc2c0be59603f5f58b16231 /activerecord/test/cases/method_scoping_test.rb
parentb17e358e3df34c03019e357f693611618092e1d6 (diff)
parent8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff)
downloadrails-f915f9e33903ee474920e24ad12a1625f2ef1c52.tar.gz
rails-f915f9e33903ee474920e24ad12a1625f2ef1c52.tar.bz2
rails-f915f9e33903ee474920e24ad12a1625f2ef1c52.zip
Merge branch 'master' into app
Conflicts: railties/lib/rails/application.rb
Diffstat (limited to 'activerecord/test/cases/method_scoping_test.rb')
-rw-r--r--activerecord/test/cases/method_scoping_test.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
index fbd1adf088..1081aa40a9 100644
--- a/activerecord/test/cases/method_scoping_test.rb
+++ b/activerecord/test/cases/method_scoping_test.rb
@@ -588,7 +588,7 @@ class HasAndBelongsToManyScopingTest< ActiveRecord::TestCase
end
class DefaultScopingTest < ActiveRecord::TestCase
- fixtures :developers
+ fixtures :developers, :posts
def test_default_scope
expected = Developer.find(:all, :order => 'salary DESC').collect { |dev| dev.salary }
@@ -657,6 +657,12 @@ class DefaultScopingTest < ActiveRecord::TestCase
received = DeveloperOrderedBySalary.find(:all, :order => 'salary').collect { |dev| dev.salary }
assert_equal expected, received
end
+
+ def test_default_scope_using_relation
+ posts = PostWithComment.scoped
+ assert_equal 2, posts.count
+ assert_equal posts(:thinking), posts.first
+ end
end
=begin