Fixed #22935 -- Changed ForeignKey.default_error_messages['invalid'] to refer to correct field.

Thanks Tim Graham for suggestion and review.

2 files changed, 7 insertions, 1 deletions

diff --git a/tests/validation/models.py b/tests/validation/models.py
index 157b8cb158..1fe4aeb104 100644
--- a/tests/validation/models.py
+++ b/tests/validation/models.py
@@ -18,6 +18,7 @@ class ModelToValidate(models.Model):
     number = models.IntegerField(db_column='number_val')
     parent = models.ForeignKey('self', blank=True, null=True, limit_choices_to={'number': 10})
     email = models.EmailField(blank=True)
+    ufm = models.ForeignKey('UniqueFieldsModel', to_field='unique_charfield', blank=True, null=True)
     url = models.URLField(blank=True)
     f_with_custom_validator = models.IntegerField(blank=True, null=True, validators=[validate_answer_to_universe])
     slug = models.SlugField(blank=True)
diff --git a/tests/validation/tests.py b/tests/validation/tests.py
index 6122444e3d..e1cfd64937 100644
--- a/tests/validation/tests.py
+++ b/tests/validation/tests.py
@@ -25,7 +25,12 @@ class BaseModelValidationTests(ValidationTestCase):
 
     def test_wrong_FK_value_raises_error(self):
         mtv = ModelToValidate(number=10, name='Some Name', parent_id=3)
-        self.assertFailsValidation(mtv.full_clean, ['parent'])
+        self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'parent',
+            ['model to validate instance with id %r does not exist.' % mtv.parent_id])
+
+        mtv = ModelToValidate(number=10, name='Some Name', ufm_id='Some Name')
+        self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'ufm',
+            ["unique fields model instance with unique_charfield %r does not exist." % mtv.name])
 
     def test_correct_FK_value_validates(self):
         parent = ModelToValidate.objects.create(number=10, name='Some Name')