1 files changed, 30 insertions, 16 deletions
diff --git a/tests/regressiontests/admin_changelist/tests.py b/tests/regressiontests/admin_changelist/tests.py
index b70d7c51f4..c8ad1ce8f6 100644
--- a/tests/regressiontests/admin_changelist/tests.py
+++ b/tests/regressiontests/admin_changelist/tests.py
@@ -1,10 +1,10 @@
-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
@@ -18,9 +18,8 @@ class ChangeListTests(unittest.TestCase):
 
     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.
+        Verifies that inclusion tag result_list generates a table when with
+        default ModelAdmin settings.
         """
         new_parent = Parent.objects.create(name='parent')
         new_child = Child.objects.create(name='name', parent=new_parent)
@@ -29,16 +28,27 @@ class ChangeListTests(unittest.TestCase):
         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 tests for #11791: Inclusion tag result_list generates a 
+        table and this checks that the items are nested within the table
+        element tags.
+        Also a regression test for #13599, verifies that hidden fields
+        when list_editable is enabled are rendered in a div outside the 
+        table.
+        """
+        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']
@@ -52,10 +62,14 @@ class ChangeListTests(unittest.TestCase):
         template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
         context = Context({'cl': cl})
         table_output = template.render(context)
-        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.')
+        # make sure that hidden fields are in the correct place
+        hiddenfields_div = '<div class="hiddenfields"><input type="hidden" name="form-0-id" value="1" id="id_form-0-id" /></div>'
+        self.failIf(table_output.find(hiddenfields_div) == -1,
+            'Failed to find hidden fields in: %s' % table_output)
+        # make sure that list editable fields are rendered in divs correctly
+        editable_name_field = '<input name="form-0-name" value="name" class="vTextField" maxlength="30" type="text" id="id_form-0-name" />'
+        self.failIf('<td>%s</td>' % editable_name_field == -1,
+            'Failed to find "name" list_editable field in: %s' % table_output)
 
 class ChildAdmin(admin.ModelAdmin):
     list_display = ['name', 'parent']