use existing model for testing Base.create with #after_initialize

cldwalker · Jul 24, 2011 · f5e4d13 · f5e4d13
1 parent 6e3c0a5
commit f5e4d13
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 23 deletions.
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
@@ -21,7 +21,7 @@
 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 @@ def test_initialize_with_invalid_attribute
   end
 
   def test_create_after_initialize_without_block
-    wp = WholesaleProduct.create(:wholesale => 10)
+    cb = CustomBulb.create(:name => 'Dude')
-    assert_equal(20, wp.msrp)
+    assert_equal('Dude', cb.name)
-    assert_equal(10, wp.wholesale)
+    assert_equal(true, cb.frickinawesome)
   end
 
   def test_create_after_initialize_with_block
-    wp = WholesaleProduct.create do |w|
+    cb = CustomBulb.create {|c| c.name = 'Dude' }
-      w.wholesale = 10
+    assert_equal('Dude', cb.name)
-    end
+    assert_equal(true, cb.frickinawesome)
-    assert_equal(20, wp.msrp)
-    assert_equal(10, wp.wholesale)
   end
 
   def test_load

diff --git a/activerecord/test/models/bulb.rb b/activerecord/test/models/bulb.rb
@@ -33,4 +33,9 @@ def self.new(attributes = {}, options = {}, &block)
 end
 
 class CustomBulb < Bulb
+  after_initialize :set_awesomeness
+
+  def set_awesomeness
+    self.frickinawesome = true if name == 'Dude'
+  end
 end
diff --git a/activerecord/test/models/wholesale_product.rb b/activerecord/test/models/wholesale_product.rb
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
@@ -678,11 +678,6 @@ def create_table(*args, &block)
     t.references :wheelable, :polymorphic => true
   end
 
-  create_table :wholesale_products, :force => true do |t|
-    t.integer :msrp
-    t.integer :wholesale
-  end
-
   create_table :zines, :force => true do |t|
     t.string :title
   end