diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
| commit | 3de59e916d6a3d4eab202cf0c99b1f88905a3b43 (patch) | |
| tree | def6d6a808ebe187be1f37f8a739fd786cc11f02 /activerecord/test/cases/named_scope_test.rb | |
| parent | c1cbf02e3170f1004daf4a146cbc41176c2458d3 (diff) | |
| parent | 62fd1d3716b4b5fd1d91cdcc77003efe80fc5a7e (diff) | |
| download | rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.gz rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.bz2 rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'activerecord/test/cases/named_scope_test.rb')
| -rw-r--r-- | activerecord/test/cases/named_scope_test.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb index 10daff5d65..3cb6b01e80 100644 --- a/activerecord/test/cases/named_scope_test.rb +++ b/activerecord/test/cases/named_scope_test.rb @@ -354,10 +354,6 @@ class NamedScopeTest < ActiveRecord::TestCase assert_equal [posts(:sti_comments)], Post.with_special_comments.with_post(4).all.to_a.uniq end - def test_methods_invoked_within_scopes_should_respect_scope - assert_equal [], Topic.approved.by_rejected_ids.proxy_options[:conditions][:id] - end - def test_named_scopes_batch_finders assert_equal 3, Topic.approved.count |