diff options
| author | Tim Graham <timograham@gmail.com> | 2013-07-26 14:43:46 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-07-26 14:47:58 -0400 |
| commit | dbbd2b1272e5a3ce7ab4b39b9a74f4ea725b104f (patch) | |
| tree | 282b5d7eb215cc6ef471898571dd17666abdf4ad /tests | |
| parent | 5cc1ea4773f628f93dd2db9d353dc6b980e4a3ab (diff) | |
[1.6.x] Fixed #20805 -- Removed an extra colon beside checkboxes in the admin.
Thanks CollinAnderson for the report.
Backport of 8676318d2d from master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/admin_util/tests.py | 4 | ||||
| -rw-r--r-- | tests/forms_tests/tests/test_forms.py | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tests/admin_util/tests.py b/tests/admin_util/tests.py index 637f643261..4a9a203f50 100644 --- a/tests/admin_util/tests.py +++ b/tests/admin_util/tests.py @@ -301,7 +301,7 @@ class UtilTests(SimpleTestCase): self.assertHTMLEqual(helpers.AdminField(form, 'text', is_first=False).label_tag(), '<label for="id_text" class="required inline"><i>text</i>:</label>') self.assertHTMLEqual(helpers.AdminField(form, 'cb', is_first=False).label_tag(), - '<label for="id_cb" class="vCheckboxLabel required inline"><i>cb</i>:</label>') + '<label for="id_cb" class="vCheckboxLabel required inline"><i>cb</i></label>') # normal strings needs to be escaped class MyForm(forms.Form): @@ -312,7 +312,7 @@ class UtilTests(SimpleTestCase): self.assertHTMLEqual(helpers.AdminField(form, 'text', is_first=False).label_tag(), '<label for="id_text" class="required inline">&text:</label>') self.assertHTMLEqual(helpers.AdminField(form, 'cb', is_first=False).label_tag(), - '<label for="id_cb" class="vCheckboxLabel required inline">&cb:</label>') + '<label for="id_cb" class="vCheckboxLabel required inline">&cb</label>') def test_flatten_fieldsets(self): """ diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py index 633fde5026..c77181273c 100644 --- a/tests/forms_tests/tests/test_forms.py +++ b/tests/forms_tests/tests/test_forms.py @@ -1870,3 +1870,13 @@ class FormsTestCase(TestCase): boundfield = SomeForm()['field'] self.assertHTMLEqual(boundfield.label_tag(), '<label for="id_field"></label>') + + def test_label_tag_override(self): + """ + BoundField label_suffix (if provided) overrides Form label_suffix + """ + class SomeForm(Form): + field = CharField() + boundfield = SomeForm(label_suffix='!')['field'] + + self.assertHTMLEqual(boundfield.label_tag(label_suffix='$'), '<label for="id_field">Field$</label>') |