1 files changed, 13 insertions, 0 deletions
diff --git a/activerecord/test/finder_test.rb b/activerecord/test/finder_test.rb
index 1c4b9d4777..de7d1b4318 100644
--- a/activerecord/test/finder_test.rb
+++ b/activerecord/test/finder_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'fixtures/comment'
 require 'fixtures/company'
 require 'fixtures/topic'
 require 'fixtures/reply'
@@ -128,6 +129,18 @@ class FinderTest < Test::Unit::TestCase
     assert topic.attribute_present?("author_name")
     assert topic.respond_to?("author_name")
   end
+  
+  def test_find_on_blank_conditions
+    [nil, " ", [], {}].each do |blank|
+      assert_nothing_raised { Topic.find(:first, :conditions => blank) }
+    end
+  end
+  
+  def test_find_on_blank_bind_conditions
+    [ [""], ["",{}] ].each do |blank|
+      assert_nothing_raised { Topic.find(:first, :conditions => blank) }
+    end
+  end
 
   def test_find_on_array_conditions
     assert Topic.find(1, :conditions => ["approved = ?", false])