From 5ec64f96b2d83ec3c0ef574f52e4767a440017b8 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Sun, 8 May 2016 09:58:34 +0000 Subject: Fixed #26734 -- Made iterator class configurable on ModelChoiceField. --- tests/model_forms/tests.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'tests/model_forms') diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index 193b5e1fda..78e7399637 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -14,8 +14,8 @@ from django.core.validators import ValidationError 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, - modelform_factory, + ModelChoiceIterator, ModelFormMetaclass, construct_instance, + fields_for_model, model_to_dict, modelform_factory, ) from django.template import Context, Template from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature @@ -1573,6 +1573,23 @@ class ModelChoiceFieldTests(TestCase): with self.assertNumQueries(1): template.render(Context({'field': field})) + def test_modelchoicefield_iterator(self): + """ + Iterator defaults to ModelChoiceIterator and can be overridden with + the iterator attribute on a ModelChoiceField subclass. + """ + field = forms.ModelChoiceField(Category.objects.all()) + self.assertIsInstance(field.choices, ModelChoiceIterator) + + class CustomModelChoiceIterator(ModelChoiceIterator): + pass + + class CustomModelChoiceField(forms.ModelChoiceField): + iterator = CustomModelChoiceIterator + + field = CustomModelChoiceField(Category.objects.all()) + self.assertIsInstance(field.choices, CustomModelChoiceIterator) + class ModelMultipleChoiceFieldTests(TestCase): def setUp(self): -- cgit v1.3