Ticket #13599: improved_tests_base.diff

tests/regressiontests/admin_changelist/tests.py

@@ -1 @@
-import unittest 
 from django.contrib import admin
 from django.contrib.admin.views.main import ChangeList
 from django.template import Context, Template
+from django.test import TransactionTestCase
 from regressiontests.admin_changelist.models import Child, Parent
 
-class ChangeListTests(unittest.TestCase):
+class ChangeListTests(TransactionTestCase):
     def test_select_related_preserved(self):
         """
         Regression test for #10348: ChangeList.get_query_set() shouldn't
@@ -17 +17 @@
         self.assertEqual(cl.query_set.query.select_related, {'parent': {'name': {}}})
 
     def test_result_list_html(self):
-        """
-        Regression test for #11791: Inclusion tag result_list generates a 
-        table and this checks that the items are nested within the table
-        element tags.
-        """
         new_parent = Parent.objects.create(name='parent')
         new_child = Child.objects.create(name='name', parent=new_parent)
         request = MockRequest()
@@ -29 +24 @@
         cl = ChangeList(request, Child, m.list_display, m.list_display_links, 
                 m.list_filter, m.date_hierarchy, m.search_fields, 
                 m.list_select_related, m.list_per_page, m.list_editable, m)
-        FormSet = m.get_changelist_formset(request)
-        cl.formset = FormSet(queryset=cl.result_list)
+        cl.formset = None
         template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
         context = Context({'cl': cl})
         table_output = template.render(context)
-        hidden_input_elem = '<input type="hidden" name="form-0-id" value="1" id="id_form-0-id" />' 
-        self.failIf(table_output.find(hidden_input_elem) == -1,
-            'Failed to find expected hidden input element in: %s' % table_output)
-        self.failIf(table_output.find('<td>%s</td>' % hidden_input_elem) == -1,
-            'Hidden input element is not enclosed in <td> element.')
+        row_html = '<tbody><tr class="row1"><td><input type="checkbox" class="action-select" value="1" name="_selected_action" /></td><th><a href="1/">name</a></th><td>Parent object</td></tr></tbody>'
+        self.failIf(table_output.find(row_html) == -1,
+            'Failed to find expected row element: %s' % table_output)
 
+    def test_result_list_editable_html(self):
+        """
+        Regression test for #11791: Inclusion tag result_list generates a 
+        table and this checks that the items are nested within the table
+        element tags.
+        """
+        new_parent = Parent.objects.create(name='parent')
+        new_child = Child.objects.create(name='name', parent=new_parent)
+        request = MockRequest()
+        m = ChildAdmin(Child, admin.site)
+
         # Test with list_editable fields
         m.list_display = ['id', 'name', 'parent']
         m.list_display_links = ['id']
@@ -52 +55 @@
         template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
         context = Context({'cl': cl})
         table_output = template.render(context)
+        hidden_input_elem = '<input type="hidden" name="form-0-id" value="1" id="id_form-0-id" />' 
         self.failIf(table_output.find(hidden_input_elem) == -1,
             'Failed to find expected hidden input element in: %s' % table_output)
         self.failIf(table_output.find('<td>%s</td>' % hidden_input_elem) == -1,