Merge pull request #5942 from bcardarella/confirmation_error_message_on_confirmation_attribute

confirmation validation error attribute

4 files changed, 33 insertions, 9 deletions

diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index d0418170fa..f7556a249f 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -44,7 +44,7 @@ class ConfirmationValidationTest < ActiveModel::TestCase
     p.karma_confirmation = "None"
     assert p.invalid?
 
-    assert_equal ["doesn't match confirmation"], p.errors[:karma]
+    assert_equal ["doesn't match Karma"], p.errors[:karma_confirmation]
 
     p.karma = "None"
     assert p.valid?
@@ -52,4 +52,23 @@ class ConfirmationValidationTest < ActiveModel::TestCase
     Person.reset_callbacks(:validate)
   end
 
+  def test_title_confirmation_with_i18n_attribute
+    @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
+    I18n.load_path.clear
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.backend.store_translations('en', {
+      :errors => {:messages => {:confirmation => "doesn't match %{attribute}"}},
+      :activemodel => {:attributes => {:topic => {:title => 'Test Title'}}}
+    })
+
+    Topic.validates_confirmation_of(:title)
+
+    t = Topic.new("title" => "We should be confirmed","title_confirmation" => "")
+    assert t.invalid?
+    assert_equal ["doesn't match Test Title"], t.errors[:title_confirmation]
+
+    I18n.load_path.replace @old_load_path
+    I18n.backend = @old_backend
+  end
+
 end
diff --git a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
index 0679e67f84..df0fcd243a 100644
--- a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -37,7 +37,7 @@ class I18nGenerateMessageValidationTest < ActiveModel::TestCase
 
   # validates_confirmation_of: generate_message(attr_name, :confirmation, :message => custom_message)
   def test_generate_message_confirmation_with_default_message
-    assert_equal "doesn't match confirmation", @person.errors.generate_message(:title, :confirmation)
+    assert_equal "doesn't match Title", @person.errors.generate_message(:title, :confirmation)
   end
 
   def test_generate_message_confirmation_with_custom_message
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index e9f0e430fe..6b6aad3bd1 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -81,7 +81,7 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_confirmation_of on generated message #{name}" do
       Person.validates_confirmation_of :title, validation_options
       @person.title_confirmation = 'foo'
-      @person.errors.expects(:generate_message).with(:title, :confirmation, generate_message_options)
+      @person.errors.expects(:generate_message).with(:title_confirmation, :confirmation, generate_message_options.merge(:attribute => 'Title'))
       @person.valid?
     end
   end
@@ -217,24 +217,29 @@ class I18nValidationTest < ActiveModel::TestCase
 
   # To make things DRY this macro is defined to define 3 tests for every validation case.
   def self.set_expectations_for_validation(validation, error_type, &block_that_sets_validation)
+    if error_type == :confirmation
+      attribute = :title_confirmation
+    else
+      attribute = :title
+    end
     # test "validates_confirmation_of finds custom model key translation when blank"
     test "#{validation} finds custom model key translation when #{error_type}" do
-      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person => {:attributes => {:title => {error_type => 'custom message'}}}}}}
+      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person => {:attributes => {attribute => {error_type => 'custom message'}}}}}}
       I18n.backend.store_translations 'en', :errors => {:messages => {error_type => 'global message'}}
 
       yield(@person, {})
       @person.valid?
-      assert_equal ['custom message'], @person.errors[:title]
+      assert_equal ['custom message'], @person.errors[attribute]
     end
 
     # test "validates_confirmation_of finds custom model key translation with interpolation when blank"
     test "#{validation} finds custom model key translation with interpolation when #{error_type}" do
-      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person => {:attributes => {:title => {error_type => 'custom message with %{extra}'}}}}}}
+      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person => {:attributes => {attribute => {error_type => 'custom message with %{extra}'}}}}}}
       I18n.backend.store_translations 'en', :errors => {:messages => {error_type => 'global message'}}
 
       yield(@person, {:extra => "extra information"})
       @person.valid?
-      assert_equal ['custom message with extra information'], @person.errors[:title]
+      assert_equal ['custom message with extra information'], @person.errors[attribute]
     end
 
     # test "validates_confirmation_of finds global default key translation when blank"
@@ -243,7 +248,7 @@ class I18nValidationTest < ActiveModel::TestCase
 
       yield(@person, {})
       @person.valid?
-      assert_equal ['global message'], @person.errors[:title]
+      assert_equal ['global message'], @person.errors[attribute]
     end
   end
 
diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb
index 575154ffbd..90bc018ae1 100644
--- a/activemodel/test/cases/validations/validates_test.rb
+++ b/activemodel/test/cases/validations/validates_test.rb
@@ -154,6 +154,6 @@ class ValidatesTest < ActiveModel::TestCase
     topic.title = "What's happening"
     topic.title_confirmation = "Not this"
     assert !topic.valid?
-    assert_equal ['Y U NO CONFIRM'], topic.errors[:title]
+    assert_equal ['Y U NO CONFIRM'], topic.errors[:title_confirmation]
   end
 end