only yield to finder block if something is found

1 files changed, 10 insertions, 0 deletions

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 8a4ce5e963..02d5320d9d 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -175,6 +175,16 @@ class BasicsTest < ActiveRecord::TestCase
     assert Topic.table_exists?
   end
 
+  def test_finder_block
+    t = Topic.first
+    found = nil
+    Topic.find_by_id(t.id) { |f| found = f }
+    assert_equal t, found
+
+    bad_id = Topic.maximum(:id) + 1
+    Topic.find_by_id(bad_id) { |f| raise }
+  end
+
   def test_preserving_date_objects
     if current_adapter?(:SybaseAdapter)
       # Sybase ctlib does not (yet?) support the date type; use datetime instead.