Fixed #12340 -- `BaseGenericInlineFormSet.get_queryset` now returns an ordered queryset.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11800 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/regressiontests/generic_inline_admin/tests.py b/tests/regressiontests/generic_inline_admin/tests.py
index 60a370fb2d..d28cd16e1d 100644
--- a/tests/regressiontests/generic_inline_admin/tests.py
+++ b/tests/regressiontests/generic_inline_admin/tests.py
@@ -81,6 +81,11 @@ class GenericAdminViewTest(TestCase):
         inline_formset = generic_inlineformset_factory(Media,
             exclude=('url',))
 
+        # Regression test for #12340.
+        e = Episode.objects.get(name='This Week in Django')
+        formset = inline_formset(instance=e)
+        self.failUnless(formset.get_queryset().ordered)
+
 class GenericInlineAdminParametersTest(TestCase):
     fixtures = ['users.xml']
 
@@ -139,4 +144,4 @@ class GenericInlineAdminParametersTest(TestCase):
         e = self._create_object(EpisodeExclude)
         response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/episodeexclude/%s/' % e.pk)
         formset = response.context['inline_admin_formsets'][0].formset
-        self.failIf('url' in formset.forms[0], 'The formset has excluded "url" field.')
\ No newline at end of file
+        self.failIf('url' in formset.forms[0], 'The formset has excluded "url" field.')