aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-12-07 00:46:06 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-12-07 00:46:06 -0200
commit23b9cc84230042aaf7f824d70e010d7678350ec3 (patch)
tree341defb7a050322abad1f3e08014f5220e759553 /activerecord/test/cases/associations
parentcf05e5f6ea9d5d883ed510dd01531a13ff488182 (diff)
parentde75af7acc5c05c708443de40e78965925165217 (diff)
downloadrails-23b9cc84230042aaf7f824d70e010d7678350ec3.tar.gz
rails-23b9cc84230042aaf7f824d70e010d7678350ec3.tar.bz2
rails-23b9cc84230042aaf7f824d70e010d7678350ec3.zip
Merge pull request #8332 from amatsuda/ar_where_chain
Relation.where with no args can be chained with not, like, and not_like Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/query_methods.rb
Diffstat (limited to 'activerecord/test/cases/associations')
-rw-r--r--activerecord/test/cases/associations/has_many_associations_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index d25aca760f..e8cc6558ca 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -299,7 +299,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
end
def test_find_with_blank_conditions
- [[], {}, nil, ""].each do |blank|
+ [[], {}, ""].each do |blank|
assert_equal 2, Firm.all.merge!(:order => "id").first.clients.where(blank).to_a.size
end
end