fix after_initialize edge case (close #2074 and close #2175)

fix behavior when after_initialize is defined and a block is passed to Base.create

1 files changed, 23 insertions, 0 deletions

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 8b4e7dd799..934f0c8f74 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -21,6 +21,7 @@ require 'models/parrot'
 require 'models/person'
 require 'models/edge'
 require 'models/joke'
+require 'models/wholesale_product'
 require 'rexml/document'
 require 'active_support/core_ext/exception'
 
@@ -260,6 +261,28 @@ class BasicsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_create_with_after_initialize
+    wp1 = WholesaleProduct.create(:msrp => 10)
+    assert_equal(10, wp1.msrp)
+    assert_equal(5, wp1.wholesale)
+
+    wp2 = WholesaleProduct.create(:wholesale => 10)
+    assert_equal(20, wp2.msrp)
+    assert_equal(10, wp2.wholesale)
+
+    wp3 = WholesaleProduct.create do |wp|
+      wp.msrp = 10
+    end
+    assert_equal(10, wp3.msrp)
+    assert_equal(5, wp3.wholesale)
+
+    wp4 = WholesaleProduct.create do |wp|
+      wp.wholesale = 10
+    end
+    assert_equal(20, wp4.msrp)
+    assert_equal(10, wp4.wholesale)
+  end
+
   def test_load
     topics = Topic.find(:all, :order => 'id')
     assert_equal(4, topics.size)