Merge pull request #9220 from robertomiranda/where-with-empty-hash

Active Record: Change behaviour with empty hash in where clause

1 files changed, 6 insertions, 2 deletions

diff --git a/activerecord/test/cases/relation/where_test.rb b/activerecord/test/cases/relation/where_test.rb
index 53cdf89b1f..8c8f4267a9 100644
--- a/activerecord/test/cases/relation/where_test.rb
+++ b/activerecord/test/cases/relation/where_test.rb
@@ -92,7 +92,9 @@ module ActiveRecord
     end
 
     def test_where_with_table_name_and_empty_hash
-      assert_equal 0, Post.where(:posts => {}).count
+      assert_raises(ArgumentError) do
+        Post.where(:posts => {})
+      end
     end
 
     def test_where_with_table_name_and_empty_array
@@ -100,7 +102,9 @@ module ActiveRecord
     end
 
     def test_where_with_empty_hash_and_no_foreign_key
-      assert_equal 0, Edge.where(:sink => {}).count
+      assert_raises(ArgumentError) do
+        Edge.where(:sink => {}).count
+      end
     end
 
     def test_where_with_blank_conditions