Merge pull request #36639 from Edouard-chin/ec-am-errors-fullmessages

Move the `ActiveModel:Errors#full_message` method to the `Error` class:

3 files changed, 80 insertions, 46 deletions

diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 9d31ed0a99..d66d6ceff0 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -482,6 +482,27 @@ class ErrorsTest < ActiveModel::TestCase
     assert_nil person.errors.as_json.default_proc
   end
 
+  test "full_messages doesn't require the base object to respond to `:errors" do
+    model = Class.new do
+      def initialize
+        @errors = ActiveModel::Errors.new(self)
+        @errors.add(:name, "bar")
+      end
+
+      def self.human_attribute_name(attr, options = {})
+        "foo"
+      end
+
+      def call
+        error_wrapper = Struct.new(:model_errors)
+
+        error_wrapper.new(@errors)
+      end
+    end
+
+    assert_equal(["foo bar"], model.new.call.model_errors.full_messages)
+  end
+
   test "full_messages creates a list of error messages with the attribute name included" do
     person = Person.new
     person.errors.add(:name, "cannot be blank")
diff --git a/activemodel/test/cases/railtie_test.rb b/activemodel/test/cases/railtie_test.rb
index 95ee7cace3..f5ff1a3fd7 100644
--- a/activemodel/test/cases/railtie_test.rb
+++ b/activemodel/test/cases/railtie_test.rb
@@ -35,20 +35,20 @@ class RailtieTest < ActiveModel::TestCase
   test "i18n customize full message defaults to false" do
     @app.initialize!
 
-    assert_equal false, ActiveModel::Errors.i18n_customize_full_message
+    assert_equal false, ActiveModel::Error.i18n_customize_full_message
   end
 
   test "i18n customize full message can be disabled" do
     @app.config.active_model.i18n_customize_full_message = false
     @app.initialize!
 
-    assert_equal false, ActiveModel::Errors.i18n_customize_full_message
+    assert_equal false, ActiveModel::Error.i18n_customize_full_message
   end
 
   test "i18n customize full message can be enabled" do
     @app.config.active_model.i18n_customize_full_message = true
     @app.initialize!
 
-    assert_equal true, ActiveModel::Errors.i18n_customize_full_message
+    assert_equal true, ActiveModel::Error.i18n_customize_full_message
   end
 end
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index b7ee50832c..c81649f493 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -13,8 +13,8 @@ class I18nValidationTest < ActiveModel::TestCase
     I18n.backend = I18n::Backend::Simple.new
     I18n.backend.store_translations("en", errors: { messages: { custom: nil } })
 
-    @original_i18n_customize_full_message = ActiveModel::Errors.i18n_customize_full_message
-    ActiveModel::Errors.i18n_customize_full_message = true
+    @original_i18n_customize_full_message = ActiveModel::Error.i18n_customize_full_message
+    ActiveModel::Error.i18n_customize_full_message = true
   end
 
   def teardown
@@ -24,7 +24,7 @@ class I18nValidationTest < ActiveModel::TestCase
     I18n.load_path.replace @old_load_path
     I18n.backend = @old_backend
     I18n.backend.reload!
-    ActiveModel::Errors.i18n_customize_full_message = @original_i18n_customize_full_message
+    ActiveModel::Error.i18n_customize_full_message = @original_i18n_customize_full_message
   end
 
   def test_full_message_encoding
@@ -49,7 +49,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def test_errors_full_messages_doesnt_use_attribute_format_without_config
-    ActiveModel::Errors.i18n_customize_full_message = false
+    ActiveModel::Error.i18n_customize_full_message = false
 
     I18n.backend.store_translations("en", activemodel: {
       errors: { models: { person: { attributes: { name: { format: "%{message}" } } } } } })
@@ -59,8 +59,21 @@ class I18nValidationTest < ActiveModel::TestCase
     assert_equal "Name test cannot be blank", person.errors.full_message(:name_test, "cannot be blank")
   end
 
+  def test_errors_full_messages_on_nested_error_uses_attribute_format
+    ActiveModel::Error.i18n_customize_full_message = true
+    I18n.backend.store_translations("en", activemodel: {
+      errors: { models: { person: { attributes: { gender: "Gender" } } } },
+      attributes: { "person/contacts": { gender: "Gender" } }
+    })
+
+    person = person_class.new
+    error = ActiveModel::Error.new(person, :gender, "can't be blank")
+    person.errors.import(error, attribute: "person[0].contacts.gender")
+    assert_equal ["Gender can't be blank"], person.errors.full_messages
+  end
+
   def test_errors_full_messages_uses_attribute_format
-    ActiveModel::Errors.i18n_customize_full_message = true
+    ActiveModel::Error.i18n_customize_full_message = true
 
     I18n.backend.store_translations("en", activemodel: {
       errors: { models: { person: { attributes: { name: { format: "%{message}" } } } } } })
@@ -71,7 +84,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def test_errors_full_messages_uses_model_format
-    ActiveModel::Errors.i18n_customize_full_message = true
+    ActiveModel::Error.i18n_customize_full_message = true
 
     I18n.backend.store_translations("en", activemodel: {
       errors: { models: { person: { format: "%{message}" } } } })
@@ -82,7 +95,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def test_errors_full_messages_uses_deeply_nested_model_attributes_format
-    ActiveModel::Errors.i18n_customize_full_message = true
+    ActiveModel::Error.i18n_customize_full_message = true
 
     I18n.backend.store_translations("en", activemodel: {
       errors: { models: { 'person/contacts/addresses': { attributes: { street: { format: "%{message}" } } } } } })
@@ -93,7 +106,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def test_errors_full_messages_uses_deeply_nested_model_model_format
-    ActiveModel::Errors.i18n_customize_full_message = true
+    ActiveModel::Error.i18n_customize_full_message = true
 
     I18n.backend.store_translations("en", activemodel: {
       errors: { models: { 'person/contacts/addresses': { format: "%{message}" } } } })
@@ -104,7 +117,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def test_errors_full_messages_with_indexed_deeply_nested_attributes_and_attributes_format
-    ActiveModel::Errors.i18n_customize_full_message = true
+    ActiveModel::Error.i18n_customize_full_message = true
 
     I18n.backend.store_translations("en", activemodel: {
       errors: { models: { 'person/contacts/addresses': { attributes: { street: { format: "%{message}" } } } } } })
@@ -115,7 +128,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def test_errors_full_messages_with_indexed_deeply_nested_attributes_and_model_format
-    ActiveModel::Errors.i18n_customize_full_message = true
+    ActiveModel::Error.i18n_customize_full_message = true
 
     I18n.backend.store_translations("en", activemodel: {
       errors: { models: { 'person/contacts/addresses': { format: "%{message}" } } } })
@@ -126,7 +139,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def test_errors_full_messages_with_indexed_deeply_nested_attributes_and_i18n_attribute_name
-    ActiveModel::Errors.i18n_customize_full_message = true
+    ActiveModel::Error.i18n_customize_full_message = true
 
     I18n.backend.store_translations("en", activemodel: {
       attributes: { 'person/contacts/addresses': { country: "Country" } }
@@ -138,7 +151,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def test_errors_full_messages_with_indexed_deeply_nested_attributes_without_i18n_config
-    ActiveModel::Errors.i18n_customize_full_message = false
+    ActiveModel::Error.i18n_customize_full_message = false
 
     I18n.backend.store_translations("en", activemodel: {
       errors: { models: { 'person/contacts/addresses': { attributes: { street: { format: "%{message}" } } } } } })
@@ -149,7 +162,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def test_errors_full_messages_with_i18n_attribute_name_without_i18n_config
-    ActiveModel::Errors.i18n_customize_full_message = false
+    ActiveModel::Error.i18n_customize_full_message = false
 
     I18n.backend.store_translations("en", activemodel: {
       attributes: { 'person/contacts[0]/addresses[0]': { country: "Country" } }
@@ -178,8 +191,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_confirmation_of on generated message #{name}" do
       person_class.validates_confirmation_of :title, validation_options
       @person.title_confirmation = "foo"
-      call = [:title_confirmation, :confirmation, generate_message_options.merge(attribute: "Title")]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title_confirmation, :confirmation, @person, generate_message_options.merge(attribute: "Title")]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -189,8 +202,8 @@ class I18nValidationTest < ActiveModel::TestCase
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_acceptance_of on generated message #{name}" do
       person_class.validates_acceptance_of :title, validation_options.merge(allow_nil: false)
-      call = [:title, :accepted, generate_message_options]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :accepted, @person, generate_message_options]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -200,8 +213,8 @@ class I18nValidationTest < ActiveModel::TestCase
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_presence_of on generated message #{name}" do
       person_class.validates_presence_of :title, validation_options
-      call = [:title, :blank, generate_message_options]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :blank, @person, generate_message_options]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -211,8 +224,8 @@ class I18nValidationTest < ActiveModel::TestCase
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_length_of for :within on generated message when too short #{name}" do
       person_class.validates_length_of :title, validation_options.merge(within: 3..5)
-      call = [:title, :too_short, generate_message_options.merge(count: 3)]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :too_short, @person, generate_message_options.merge(count: 3)]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -223,8 +236,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_length_of for :too_long generated message #{name}" do
       person_class.validates_length_of :title, validation_options.merge(within: 3..5)
       @person.title = "this title is too long"
-      call = [:title, :too_long, generate_message_options.merge(count: 5)]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :too_long, @person, generate_message_options.merge(count: 5)]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -234,8 +247,8 @@ class I18nValidationTest < ActiveModel::TestCase
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_length_of for :is on generated message #{name}" do
       person_class.validates_length_of :title, validation_options.merge(is: 5)
-      call = [:title, :wrong_length, generate_message_options.merge(count: 5)]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :wrong_length, @person, generate_message_options.merge(count: 5)]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -246,8 +259,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_format_of on generated message #{name}" do
       person_class.validates_format_of :title, validation_options.merge(with: /\A[1-9][0-9]*\z/)
       @person.title = "72x"
-      call = [:title, :invalid, generate_message_options.merge(value: "72x")]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :invalid, @person, generate_message_options.merge(value: "72x")]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -258,8 +271,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_inclusion_of on generated message #{name}" do
       person_class.validates_inclusion_of :title, validation_options.merge(in: %w(a b c))
       @person.title = "z"
-      call = [:title, :inclusion, generate_message_options.merge(value: "z")]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :inclusion, @person, generate_message_options.merge(value: "z")]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -270,8 +283,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_inclusion_of using :within on generated message #{name}" do
       person_class.validates_inclusion_of :title, validation_options.merge(within: %w(a b c))
       @person.title = "z"
-      call = [:title, :inclusion, generate_message_options.merge(value: "z")]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :inclusion, @person, generate_message_options.merge(value: "z")]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -282,8 +295,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_exclusion_of generated message #{name}" do
       person_class.validates_exclusion_of :title, validation_options.merge(in: %w(a b c))
       @person.title = "a"
-      call = [:title, :exclusion, generate_message_options.merge(value: "a")]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :exclusion, @person, generate_message_options.merge(value: "a")]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -294,8 +307,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_exclusion_of using :within generated message #{name}" do
       person_class.validates_exclusion_of :title, validation_options.merge(within: %w(a b c))
       @person.title = "a"
-      call = [:title, :exclusion, generate_message_options.merge(value: "a")]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :exclusion, @person, generate_message_options.merge(value: "a")]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -306,8 +319,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_numericality_of generated message #{name}" do
       person_class.validates_numericality_of :title, validation_options
       @person.title = "a"
-      call = [:title, :not_a_number, generate_message_options.merge(value: "a")]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :not_a_number, @person, generate_message_options.merge(value: "a")]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -318,8 +331,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_numericality_of for :only_integer on generated message #{name}" do
       person_class.validates_numericality_of :title, validation_options.merge(only_integer: true)
       @person.title = "0.0"
-      call = [:title, :not_an_integer, generate_message_options.merge(value: "0.0")]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :not_an_integer, @person, generate_message_options.merge(value: "0.0")]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -330,8 +343,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_numericality_of for :odd on generated message #{name}" do
       person_class.validates_numericality_of :title, validation_options.merge(only_integer: true, odd: true)
       @person.title = 0
-      call = [:title, :odd, generate_message_options.merge(value: 0)]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :odd, @person, generate_message_options.merge(value: 0)]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end
@@ -342,8 +355,8 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_numericality_of for :less_than on generated message #{name}" do
       person_class.validates_numericality_of :title, validation_options.merge(only_integer: true, less_than: 0)
       @person.title = 1
-      call = [:title, :less_than, generate_message_options.merge(value: 1, count: 0)]
-      assert_called_with(@person.errors, :generate_message, call) do
+      call = [:title, :less_than, @person, generate_message_options.merge(value: 1, count: 0)]
+      assert_called_with(ActiveModel::Error, :generate_message, call) do
         @person.valid?
         @person.errors.messages
       end