summaryrefslogtreecommitdiff
path: root/tests/forms_tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/forms_tests')
-rw-r--r--tests/forms_tests/models.py7
-rw-r--r--tests/forms_tests/tests/tests.py24
2 files changed, 2 insertions, 29 deletions
diff --git a/tests/forms_tests/models.py b/tests/forms_tests/models.py
index fa63d08fd1..327fd7802c 100644
--- a/tests/forms_tests/models.py
+++ b/tests/forms_tests/models.py
@@ -130,12 +130,5 @@ class FileModel(models.Model):
file = models.FileField(storage=temp_storage, upload_to='tests')
-class Group(models.Model):
- name = models.CharField(max_length=10)
-
- def __str__(self):
- return '%s' % self.name
-
-
class Article(models.Model):
content = models.TextField()
diff --git a/tests/forms_tests/tests/tests.py b/tests/forms_tests/tests/tests.py
index 841a1c6799..de04e8a3bc 100644
--- a/tests/forms_tests/tests/tests.py
+++ b/tests/forms_tests/tests/tests.py
@@ -2,15 +2,13 @@ import datetime
from django.core.files.uploadedfile import SimpleUploadedFile
from django.db import models
-from django.forms import (
- CharField, FileField, Form, ModelChoiceField, ModelForm,
-)
+from django.forms import CharField, FileField, Form, ModelForm
from django.forms.models import ModelFormMetaclass
from django.test import SimpleTestCase, TestCase
from ..models import (
BoundaryModel, ChoiceFieldModel, ChoiceModel, ChoiceOptionModel, Defaults,
- FileModel, Group, OptionalMultiChoiceModel,
+ FileModel, OptionalMultiChoiceModel,
)
@@ -56,24 +54,6 @@ class FileForm(Form):
file1 = FileField()
-class TestModelChoiceField(TestCase):
-
- def test_choices_not_fetched_when_not_rendering(self):
- """
- Generating choices for ModelChoiceField should require 1 query (#12510).
- """
- self.groups = [Group.objects.create(name=name) for name in 'abc']
- # only one query is required to pull the model from DB
- with self.assertNumQueries(1):
- field = ModelChoiceField(Group.objects.order_by('-name'))
- self.assertEqual('a', field.clean(self.groups[0].pk).name)
-
- def test_queryset_manager(self):
- f = ModelChoiceField(ChoiceOptionModel.objects)
- choice = ChoiceOptionModel.objects.create(name="choice 1")
- self.assertEqual(list(f.choices), [('', '---------'), (choice.pk, str(choice))])
-
-
class TestTicket14567(TestCase):
"""
The return values of ModelMultipleChoiceFields are QuerySets