aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRyan Naughton <Ryan.J.Naughton@gmail.com>2011-11-14 21:43:27 -0600
committerRyan Naughton <Ryan.J.Naughton@gmail.com>2011-11-14 21:43:27 -0600
commit63a22ca6169f06d10cd843ea3a75df6498fdcf7d (patch)
treee0dac46ef7ca2dc0f6b66ff480e0099995bbc2a6 /activerecord/test
parente1b79c56bef43d858fc59dbe7506039414c9e4ed (diff)
downloadrails-63a22ca6169f06d10cd843ea3a75df6498fdcf7d.tar.gz
rails-63a22ca6169f06d10cd843ea3a75df6498fdcf7d.tar.bz2
rails-63a22ca6169f06d10cd843ea3a75df6498fdcf7d.zip
Fixes issue #3483, regarding using a mixture of ranges and discrete values in find conditions. Paired with Joey Schoblaska.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/finder_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 688679f081..05c4b15407 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -375,7 +375,7 @@ class FinderTest < ActiveRecord::TestCase
end
def test_find_on_hash_conditions_with_array_of_integers_and_ranges
- assert_equal [1,2,3], Comment.find(:all, :conditions => { :post_id => [1..2, 3, 4, 5..10]}).map(&:id).sort
+ assert_equal [1,2,3,5,6,7,8,9], Comment.find(:all, :conditions => {:id => [1..2, 3, 5, 6..8, 9]}).map(&:id).sort
end
def test_find_on_multiple_hash_conditions