diff options
Diffstat (limited to 'tests/modeladmin/tests.py')
| -rw-r--r-- | tests/modeladmin/tests.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py index 74bbc83efb..5ca7999bf0 100644 --- a/tests/modeladmin/tests.py +++ b/tests/modeladmin/tests.py @@ -18,6 +18,7 @@ from django.contrib.admin.widgets import ( ) from django.contrib.auth.models import User from django.db import models +from django.db.models.utils import get_blank_choice_label from django.forms.widgets import Select from django.test import RequestFactory, SimpleTestCase, TestCase from django.test.utils import isolate_apps @@ -636,7 +637,7 @@ class ModelAdminTests(TestCase): '<div class="related-widget-wrapper" data-model-ref="band">' '<select data-context="available-source" ' 'name="main_band" id="id_main_band" required>' - '<option value="" selected>---------</option>' + '<option value="" selected>- Select an option -</option>' '<option value="%s">The Beatles</option>' '<option value="%s">The Doors</option>' "</select></div>" % (band2.id, self.band.id), @@ -660,8 +661,8 @@ class ModelAdminTests(TestCase): '<div class="related-widget-wrapper" data-model-ref="band">' '<select data-context="available-source" ' 'name="main_band" id="id_main_band" required>' - '<option value="" selected>---------</option>' - '<option value="%s">The Doors</option>' + '<option value="" selected>- Select an option -</option>' + '<option value="%d">The Doors</option>' "</select></div>" % self.band.id, ) @@ -708,30 +709,31 @@ class ModelAdminTests(TestCase): # ForeignKey widgets in the admin are wrapped with # RelatedFieldWidgetWrapper so they need to be handled properly when # type checking. For Select fields, all of the choices lists have a - # first entry of dashes. + # first entry of a translatable blank choice label. + blank_option = ("", get_blank_choice_label()) cma = ModelAdmin(Concert, self.site) cmafa = cma.get_form(request) self.assertEqual(type(cmafa.base_fields["main_band"].widget.widget), Select) self.assertEqual( list(cmafa.base_fields["main_band"].widget.choices), - [("", "---------"), (self.band.id, "The Doors")], + [blank_option, (self.band.id, "The Doors")], ) self.assertEqual(type(cmafa.base_fields["opening_band"].widget.widget), Select) self.assertEqual( list(cmafa.base_fields["opening_band"].widget.choices), - [("", "---------"), (self.band.id, "The Doors")], + [blank_option, (self.band.id, "The Doors")], ) self.assertEqual(type(cmafa.base_fields["day"].widget), Select) self.assertEqual( list(cmafa.base_fields["day"].widget.choices), - [("", "---------"), (1, "Fri"), (2, "Sat")], + [blank_option, (1, "Fri"), (2, "Sat")], ) self.assertEqual(type(cmafa.base_fields["transport"].widget), Select) self.assertEqual( list(cmafa.base_fields["transport"].widget.choices), - [("", "---------"), (1, "Plane"), (2, "Train"), (3, "Bus")], + [blank_option, (1, "Plane"), (2, "Train"), (3, "Bus")], ) def test_foreign_key_as_radio_field(self): @@ -849,7 +851,7 @@ class ModelAdminTests(TestCase): 'class="related-widget-wrapper" data-model-ref="band"><select ' 'name="main_band" data-context="available-source" required ' 'id="id_main_band" data-custom-widget="true" multiple>' - '<option value="">---------</option>' + '<option value="">- Select an option -</option>' f'<option value="{self.band.pk}">The Doors</option>' "</select></div></div>" ) |