Merge pull request #11004 from fredwu/4-0-activemodel-inclusion-chain…

…-fix Fixed ActiveModel::Model's inclusion chain
rails · Jun 19, 2013 · 6ed17e2 · 6ed17e2
2 parents f81dd36 + 2d9b73b
commit 6ed17e2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/activemodel/lib/active_model/model.rb b/activemodel/lib/active_model/model.rb
@@ -79,6 +79,8 @@ def initialize(params={})
       params.each do |attr, value|
         self.public_send("#{attr}=", value)
       end if params
+
+      super
     end
 
     # Indicates if the model is persisted. Default is +false+.

diff --git a/activemodel/test/cases/model_test.rb b/activemodel/test/cases/model_test.rb
@@ -3,7 +3,14 @@
 class ModelTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests
 
+  module DefaultValue
+    def initialize(*args)
+      @attr ||= 'default value'
+    end
+  end
+
   class BasicModel
+    include DefaultValue
     include ActiveModel::Model
     attr_accessor :attr
   end
@@ -29,4 +36,9 @@ def test_persisted_is_always_false
     object = BasicModel.new(:attr => "value")
     assert object.persisted? == false
   end
+
+  def test_mixin_inclusion_chain
+    object = BasicModel.new
+    assert_equal object.attr, 'default value'
+  end
 end