2 files changed, 16 insertions, 9 deletions
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 1cf09758f9..e4f602bd80 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -5,11 +5,10 @@ class Dog
   include ActiveModel::Validations
   include ActiveModel::Validations::Callbacks
 
-  attr_accessor :name
-  attr_writer   :history
+  attr_accessor :name, :history
 
-  def history
-    @history ||= []
+  def initialize
+    @history = []
   end
 end
 
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index ed4d8fcdca..0b1de62a48 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -58,8 +58,7 @@ class ValidationsTest < ActiveModel::TestCase
     r = Reply.new
     r.valid?
 
-    errors = []
-    r.errors.each {|attr, messages| errors << [attr.to_s, messages] }
+    errors = r.errors.collect {|attr, messages| [attr.to_s, messages]}
 
     assert errors.include?(["title", "is Empty"])
     assert errors.include?(["content", "is Empty"])
@@ -311,7 +310,7 @@ class ValidationsTest < ActiveModel::TestCase
   end
 
   def test_strict_validation_particular_validator
-    Topic.validates :title,  :presence => {:strict => true}
+    Topic.validates :title,  :presence => { :strict => true }
     assert_raises ActiveModel::StrictValidationFailed do
       Topic.new.valid?
     end
@@ -331,9 +330,18 @@ class ValidationsTest < ActiveModel::TestCase
     end
   end
 
+  def test_strict_validation_error_message
+    Topic.validates :title, :strict => true, :presence => true
+
+    exception = assert_raises(ActiveModel::StrictValidationFailed) do
+      Topic.new.valid?
+    end
+    assert_equal "Title can't be blank", exception.message
+  end
+
   def test_does_not_modify_options_argument
-    options = {:presence => true}
+    options = { :presence => true }
     Topic.validates :title, options
-    assert_equal({:presence => true}, options)
+    assert_equal({ :presence => true }, options)
   end
 end