Merge branch 'master' into schema-alteration

1 files changed, 2 insertions, 10 deletions

diff --git a/tests/admin_validation/tests.py b/tests/admin_validation/tests.py
index 5b2c45f6f2..16f73c6390 100644
--- a/tests/admin_validation/tests.py
+++ b/tests/admin_validation/tests.py
@@ -16,10 +16,6 @@ class ValidFields(admin.ModelAdmin):
     form = SongForm
     fields = ['title']
 
-class InvalidFields(admin.ModelAdmin):
-    form = SongForm
-    fields = ['spam']
-
 class ValidFormFieldsets(admin.ModelAdmin):
     def get_form(self, request, obj=None, **kwargs):
         class ExtraFieldForm(SongForm):
@@ -49,10 +45,6 @@ class ValidationTestCase(TestCase):
         # Regression test for #8027: custom ModelForms with fields/fieldsets
         """
         validate(ValidFields, Song)
-        self.assertRaisesMessage(ImproperlyConfigured,
-            "'InvalidFields.fields' refers to field 'spam' that is missing from the form.",
-            validate,
-            InvalidFields, Song)
 
     def test_custom_get_form_with_fieldsets(self):
         """
@@ -277,8 +269,6 @@ class ValidationTestCase(TestCase):
         """
         class SongForm(forms.ModelForm):
             extra_data = forms.CharField()
-            class Meta:
-                model = Song
 
         class FieldsOnFormOnlyAdmin(admin.ModelAdmin):
             form = SongForm
@@ -295,6 +285,8 @@ class ValidationTestCase(TestCase):
             extra_data = forms.CharField()
             class Meta:
                 model = Song
+                fields = '__all__'
+
 
         class FieldsOnFormOnlyAdmin(admin.ModelAdmin):
             form = SongForm