1 files changed, 16 insertions, 3 deletions
diff --git a/tests/regressiontests/forms/tests/formsets.py b/tests/regressiontests/forms/tests/formsets.py
index bf893c4c1d..ef6f40c3e3 100644
--- a/tests/regressiontests/forms/tests/formsets.py
+++ b/tests/regressiontests/forms/tests/formsets.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.forms import Form, CharField, IntegerField, ValidationError, DateField
-from django.forms.formsets import formset_factory, BaseFormSet
+from django.forms import (CharField, DateField, FileField, Form, IntegerField,
+    ValidationError)
+from django.forms.formsets import BaseFormSet, formset_factory
 from django.forms.util import ErrorList
 from django.test import TestCase
 
@@ -974,11 +975,23 @@ class TestIsBoundBehavior(TestCase):
         self.assertHTMLEqual(empty_forms[0].as_p(), empty_forms[1].as_p())
 
 class TestEmptyFormSet(TestCase):
-    "Test that an empty formset still calls clean()"
     def test_empty_formset_is_valid(self):
+        """Test that an empty formset still calls clean()"""
         EmptyFsetWontValidateFormset = formset_factory(FavoriteDrinkForm, extra=0, formset=EmptyFsetWontValidate)
         formset = EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0', 'form-TOTAL_FORMS':'0'},prefix="form")
         formset2 = EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0', 'form-TOTAL_FORMS':'1', 'form-0-name':'bah' },prefix="form")
         self.assertFalse(formset.is_valid())
         self.assertFalse(formset2.is_valid())
 
+    def test_empty_formset_media(self):
+        """Make sure media is available on empty formset, refs #19545"""
+        class MediaForm(Form):
+            class Media:
+                js = ('some-file.js',)
+        self.assertIn('some-file.js', str(formset_factory(MediaForm, extra=0)().media))
+
+    def test_empty_formset_is_multipart(self):
+        """Make sure `is_multipart()` works with empty formset, refs #19545"""
+        class FileForm(Form):
+            file = FileField()
+        self.assertTrue(formset_factory(FileForm, extra=0)().is_multipart())