diff options
| author | Ernie Miller <ernie@metautonomo.us> | 2011-02-10 14:03:25 -0500 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-12 17:23:19 -0800 |
| commit | fbd917f50a6046d02dd6a64ccfb1aed0cbce68d8 (patch) | |
| tree | 0c7ee4599878c0f2c81d7c0fab7b6691dc3fd945 /activerecord/test/cases/method_scoping_test.rb | |
| parent | 7eb554bdb13d3469712b847add2ab0054f0698c7 (diff) | |
| download | rails-fbd917f50a6046d02dd6a64ccfb1aed0cbce68d8.tar.gz rails-fbd917f50a6046d02dd6a64ccfb1aed0cbce68d8.tar.bz2 rails-fbd917f50a6046d02dd6a64ccfb1aed0cbce68d8.zip | |
Remove Relation#& alias for Relation#merge
Diffstat (limited to 'activerecord/test/cases/method_scoping_test.rb')
| -rw-r--r-- | activerecord/test/cases/method_scoping_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb index e3ba65b4fa..7e8383da9e 100644 --- a/activerecord/test/cases/method_scoping_test.rb +++ b/activerecord/test/cases/method_scoping_test.rb @@ -227,7 +227,7 @@ class MethodScopingTest < ActiveRecord::TestCase end def test_scoped_create_with_join_and_merge - (Comment.where(:body => "but Who's Buying?").joins(:post) & Post.where(:body => 'Peace Sells...')).with_scope do + Comment.where(:body => "but Who's Buying?").joins(:post).merge(Post.where(:body => 'Peace Sells...')).with_scope do assert_equal({:body => "but Who's Buying?"}, Comment.scoped.scope_for_create) end end |