Fixed #29200 -- Fixed label rendering when using RadioSelect and CheckboxSelectMultiple with MultiWidget.

2 files changed, 19 insertions, 1 deletions

diff --git a/tests/forms_tests/widget_tests/test_radioselect.py b/tests/forms_tests/widget_tests/test_radioselect.py
index d0a70c7953..0f85563a58 100644
--- a/tests/forms_tests/widget_tests/test_radioselect.py
+++ b/tests/forms_tests/widget_tests/test_radioselect.py
@@ -1,6 +1,6 @@
 import datetime
 
-from django.forms import RadioSelect
+from django.forms import MultiWidget, RadioSelect
 from django.test import override_settings
 
 from .base import WidgetTest
@@ -130,3 +130,16 @@ class RadioSelectTest(WidgetTest):
         </ul>
         """
         self.check_html(self.widget(choices=choices), 'time', None, html=html)
+
+    def test_render_as_subwidget(self):
+        """A RadioSelect as a subwidget of MultiWidget."""
+        choices = (('', '------'),) + self.beatles
+        self.check_html(MultiWidget([self.widget(choices=choices)]), 'beatle', ['J'], html=(
+            """<ul>
+            <li><label><input type="radio" name="beatle_0" value=""> ------</label></li>
+            <li><label><input checked type="radio" name="beatle_0" value="J"> John</label></li>
+            <li><label><input type="radio" name="beatle_0" value="P"> Paul</label></li>
+            <li><label><input type="radio" name="beatle_0" value="G"> George</label></li>
+            <li><label><input type="radio" name="beatle_0" value="R"> Ringo</label></li>
+            </ul>"""
+        ))
diff --git a/tests/forms_tests/widget_tests/test_select.py b/tests/forms_tests/widget_tests/test_select.py
index beba21fe2d..42de5b6e92 100644
--- a/tests/forms_tests/widget_tests/test_select.py
+++ b/tests/forms_tests/widget_tests/test_select.py
@@ -294,6 +294,7 @@ class SelectTest(WidgetTest):
                 'template_name': 'django/forms/widgets/select_option.html',
                 'name': 'name',
                 'selected': False,
+                'wrap_label': True,
             }, {
                 'value': 'cd',
                 'type': 'select',
@@ -303,6 +304,7 @@ class SelectTest(WidgetTest):
                 'template_name': 'django/forms/widgets/select_option.html',
                 'name': 'name',
                 'selected': False,
+                'wrap_label': True,
             }]
         )
         self.assertEqual(index, 0)
@@ -319,6 +321,7 @@ class SelectTest(WidgetTest):
                 'name': 'name',
                 'selected': True,
                 'type': 'select',
+                'wrap_label': True,
             }, {
                 'value': 'dvd',
                 'template_name': 'django/forms/widgets/select_option.html',
@@ -328,6 +331,7 @@ class SelectTest(WidgetTest):
                 'name': 'name',
                 'selected': False,
                 'type': 'select',
+                'wrap_label': True,
             }]
         )
         self.assertEqual(index, 1)
@@ -344,6 +348,7 @@ class SelectTest(WidgetTest):
                 'index': '2',
                 'name': 'name',
                 'type': 'select',
+                'wrap_label': True,
             }]
         )
         self.assertEqual(index, 2)