From f956759f8ab656484add2d5bc6e8f6f4add79469 Mon Sep 17 00:00:00 2001 From: Les Fletcher Date: Thu, 21 Jul 2011 01:36:02 -0700 Subject: 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 --- activerecord/test/cases/base_test.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'activerecord/test/cases/base_test.rb') 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) -- cgit v1.2.3 From 6e3c0a5d9a22a4a08628b3f72a6b4072e0a23405 Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Fri, 22 Jul 2011 18:43:27 -0400 Subject: simplify and be more explicit about create and after_initialize tests --- activerecord/test/cases/base_test.rb | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) (limited to 'activerecord/test/cases/base_test.rb') diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 934f0c8f74..5a64a1163b 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -261,26 +261,18 @@ 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) + def test_create_after_initialize_without_block + wp = WholesaleProduct.create(:wholesale => 10) + assert_equal(20, wp.msrp) + assert_equal(10, wp.wholesale) + end - wp4 = WholesaleProduct.create do |wp| - wp.wholesale = 10 + def test_create_after_initialize_with_block + wp = WholesaleProduct.create do |w| + w.wholesale = 10 end - assert_equal(20, wp4.msrp) - assert_equal(10, wp4.wholesale) + assert_equal(20, wp.msrp) + assert_equal(10, wp.wholesale) end def test_load -- cgit v1.2.3 From f5e4d13270dbce2bb880ef6529da68aaee017910 Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Sun, 24 Jul 2011 16:36:06 -0400 Subject: use existing model for testing Base.create with #after_initialize --- activerecord/test/cases/base_test.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'activerecord/test/cases/base_test.rb') diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 5a64a1163b..f2f5b73626 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -21,7 +21,7 @@ require 'models/parrot' require 'models/person' require 'models/edge' require 'models/joke' -require 'models/wholesale_product' +require 'models/bulb' require 'rexml/document' require 'active_support/core_ext/exception' @@ -262,17 +262,15 @@ class BasicsTest < ActiveRecord::TestCase end def test_create_after_initialize_without_block - wp = WholesaleProduct.create(:wholesale => 10) - assert_equal(20, wp.msrp) - assert_equal(10, wp.wholesale) + cb = CustomBulb.create(:name => 'Dude') + assert_equal('Dude', cb.name) + assert_equal(true, cb.frickinawesome) end def test_create_after_initialize_with_block - wp = WholesaleProduct.create do |w| - w.wholesale = 10 - end - assert_equal(20, wp.msrp) - assert_equal(10, wp.wholesale) + cb = CustomBulb.create {|c| c.name = 'Dude' } + assert_equal('Dude', cb.name) + assert_equal(true, cb.frickinawesome) end def test_load -- cgit v1.2.3