3 files changed, 58 insertions, 2 deletions
diff --git a/activemodel/test/cases/model_test.rb b/activemodel/test/cases/model_test.rb
index 24e4ca91c6..ee0fa26546 100644
--- a/activemodel/test/cases/model_test.rb
+++ b/activemodel/test/cases/model_test.rb
@@ -3,7 +3,30 @@ require 'cases/helper'
 class ModelTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests
 
+  module DefaultValue
+    def self.included(klass)
+      klass.class_eval { attr_accessor :hello }
+    end
+
+    def initialize(*args)
+      @attr ||= 'default value'
+      super
+    end
+  end
+
   class BasicModel
+    include DefaultValue
+    include ActiveModel::Model
+    attr_accessor :attr
+  end
+
+  class BasicModelWithReversedMixins
+    include ActiveModel::Model
+    include DefaultValue
+    attr_accessor :attr
+  end
+
+  class SimpleModel
     include ActiveModel::Model
     attr_accessor :attr
   end
@@ -14,14 +37,20 @@ class ModelTest < ActiveModel::TestCase
 
   def test_initialize_with_params
     object = BasicModel.new(attr: "value")
-    assert_equal object.attr, "value"
+    assert_equal "value", object.attr
+  end
+
+  def test_initialize_with_params_and_mixins_reversed
+    object = BasicModelWithReversedMixins.new(attr: "value")
+    assert_equal "value", object.attr
   end
 
   def test_initialize_with_nil_or_empty_hash_params_does_not_explode
     assert_nothing_raised do
       BasicModel.new()
-      BasicModel.new nil
+      BasicModel.new(nil)
       BasicModel.new({})
+      SimpleModel.new(attr: 'value')
     end
   end
 
@@ -29,4 +58,18 @@ class ModelTest < ActiveModel::TestCase
     object = BasicModel.new(attr: "value")
     assert object.persisted? == false
   end
+
+  def test_mixin_inclusion_chain
+    object = BasicModel.new
+    assert_equal 'default value', object.attr
+  end
+
+  def test_mixin_initializer_when_args_exist
+    object = BasicModel.new(hello: 'world')
+    assert_equal 'world', object.hello
+  end
+
+  def test_mixin_initializer_when_args_dont_exist
+    assert_raises(NoMethodError) { SimpleModel.new(hello: 'world') }
+  end
 end
diff --git a/activemodel/test/cases/railtie_test.rb b/activemodel/test/cases/railtie_test.rb
index d44a3448df..0643fa775d 100644
--- a/activemodel/test/cases/railtie_test.rb
+++ b/activemodel/test/cases/railtie_test.rb
@@ -7,8 +7,12 @@ class RailtieTest < ActiveModel::TestCase
   def setup
     require 'active_model/railtie'
 
+    # Set a fake logger to avoid creating the log directory automatically
+    fake_logger = mock()
+
     @app ||= Class.new(::Rails::Application) do
       config.eager_load = false
+      config.logger = fake_logger
     end
   end
 
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 02cd3b8a93..0b900d934d 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -94,4 +94,13 @@ class SecurePasswordTest < ActiveModel::TestCase
     @user.password_confirmation = ""
     assert @user.valid?(:update), "user should be valid"
   end
+
+  test "will not save if confirmation is blank but password is not" do
+    @user.password = "password"
+    @user.password_confirmation = ""
+    assert_not @user.valid?(:create)
+
+    @user.password_confirmation = "password"
+    assert @user.valid?(:create)
+  end
 end