p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Eliminated the need to modify a model forms test when new test files are added.

This commit is contained in:
Tim Graham 2018-02-28 10:24:19 -05:00
parent 5cc28dc752
commit 3fb718f17d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/model_forms/models.py
View File

@ -151,7 +151,7 @@ class CustomFF(models.Model):
class FilePathModel(models.Model): class FilePathModel(models.Model):
path = models.FilePathField(path=os.path.dirname(__file__), match=r".*\.py$", blank=True) path = models.FilePathField(path=os.path.dirname(__file__), match='models.py', blank=True)
try: try:

8
tests/model_forms/tests.py
View File

@ -2328,18 +2328,14 @@ class FileAndImageFieldTests(TestCase):
p.image.delete(save=False) p.image.delete(save=False)
def test_file_path_field_blank(self): def test_file_path_field_blank(self):
""" """FilePathField(blank=True) includes the empty option."""
Regression test for #8842: FilePathField(blank=True)
"""
class FPForm(forms.ModelForm): class FPForm(forms.ModelForm):
class Meta: class Meta:
model = FilePathModel model = FilePathModel
fields = '__all__' fields = '__all__'
form = FPForm() form = FPForm()
names = [p[1] for p in form['path'].field.choices] self.assertEqual([name for _, name in form['path'].field.choices], ['---------', 'models.py'])
names.sort()
self.assertEqual(names, ['---------', '__init__.py', 'models.py', 'test_uuid.py', 'tests.py'])
@skipUnless(test_images, "Pillow not installed") @skipUnless(test_images, "Pillow not installed")
def test_image_field(self): def test_image_field(self):