From 00a889167f6699d02cee50848750d8d0e110d41c Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Sat, 7 Feb 2015 04:19:23 +0700 Subject: Fixed #24295 -- Allowed ModelForm meta to specify form field classes. Thanks Carl Meyer and Markus Holtermann for the reviews. --- tests/model_forms/tests.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tests/model_forms') diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index f1cf77a6a6..fcc9d269ec 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -11,7 +11,7 @@ from django.core.exceptions import ( ) from django.core.files.uploadedfile import SimpleUploadedFile from django.core.validators import ValidationError -from django.db import connection +from django.db import connection, models from django.db.models.query import EmptyQuerySet from django.forms.models import ( ModelFormMetaclass, construct_instance, fields_for_model, model_to_dict, @@ -545,6 +545,9 @@ class FieldOverridesByFormMetaForm(forms.ModelForm): ) } } + field_classes = { + 'url': forms.URLField, + } class TestFieldOverridesByFormMeta(TestCase): @@ -588,7 +591,7 @@ class TestFieldOverridesByFormMeta(TestCase): def test_error_messages_overrides(self): form = FieldOverridesByFormMetaForm(data={ 'name': 'Category', - 'url': '/category/', + 'url': 'http://www.example.com/category/', 'slug': '!%#*@', }) form.full_clean() @@ -599,6 +602,11 @@ class TestFieldOverridesByFormMeta(TestCase): ] self.assertEqual(form.errors, {'slug': error}) + def test_field_type_overrides(self): + form = FieldOverridesByFormMetaForm() + self.assertIs(Category._meta.get_field('url').__class__, models.CharField) + self.assertIsInstance(form.fields['url'], forms.URLField) + class IncompleteCategoryFormWithFields(forms.ModelForm): """ -- cgit v1.3