1 files changed, 28 insertions, 11 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 8a4ce5e963..c1b0cb8886 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -125,20 +125,13 @@ class BasicsTest < ActiveRecord::TestCase
 
   unless current_adapter?(:PostgreSQLAdapter,:OracleAdapter,:SQLServerAdapter)
     def test_limit_with_comma
-      assert_nothing_raised do
-        Topic.limit("1,2").all
-      end
+      assert Topic.limit("1,2").all
     end
   end
 
   def test_limit_without_comma
-    assert_nothing_raised do
-      assert_equal 1, Topic.limit("1").all.length
-    end
-
-    assert_nothing_raised do
-      assert_equal 1, Topic.limit(1).all.length
-    end
+    assert_equal 1, Topic.limit("1").all.length
+    assert_equal 1, Topic.limit(1).all.length
   end
 
   def test_invalid_limit
@@ -175,6 +168,24 @@ 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
+  end
+
+  def test_finder_block_nothing_found
+    bad_id = Topic.maximum(:id) + 1
+    assert_nil Topic.find_by_id(bad_id) { |f| raise }
+  end
+
+  def test_find_returns_block_value
+    t = Topic.first
+    x = Topic.find_by_id(t.id) { |f| "hi mom!" }
+    assert_equal "hi mom!", x
+  end
+
   def test_preserving_date_objects
     if current_adapter?(:SybaseAdapter)
       # Sybase ctlib does not (yet?) support the date type; use datetime instead.
@@ -1898,7 +1909,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_attribute_names
-    assert_equal ["id", "type", "ruby_type", "firm_id", "firm_name", "name", "client_of", "rating", "account_id"],
+    assert_equal ["id", "type", "ruby_type", "firm_id", "firm_name", "name", "client_of", "rating", "account_id", "description"],
                  Company.attribute_names
   end
 
@@ -1990,6 +2001,12 @@ class BasicsTest < ActiveRecord::TestCase
     assert_nil hash['firm_name']
   end
 
+  def test_default_values_are_deeply_dupped
+    company = Company.new
+    company.description << "foo"
+    assert_equal "", Company.new.description
+  end
+
   ["find_by", "find_by!"].each do |meth|
     test "#{meth} delegates to scoped" do
       record = stub