summaryrefslogtreecommitdiff
path: root/tests/model_forms/tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/model_forms/tests.py')
-rw-r--r--tests/model_forms/tests.py47
1 files changed, 27 insertions, 20 deletions
diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py
index 3d4eb06cf4..466b7dc57b 100644
--- a/tests/model_forms/tests.py
+++ b/tests/model_forms/tests.py
@@ -14,6 +14,7 @@ from django.core.exceptions import (
from django.core.files.uploadedfile import SimpleUploadedFile
from django.db import connection, models
from django.db.models.query import EmptyQuerySet
+from django.db.models.utils import get_blank_choice_label
from django.forms.models import (
ModelFormMetaclass,
construct_instance,
@@ -343,7 +344,7 @@ class ModelFormBaseTest(TestCase):
self.assertEqual(
list(form.fields["author"].choices),
[
- ("", "---------"),
+ ("", get_blank_choice_label()),
(writer.pk, "Joe Doe"),
],
)
@@ -1531,7 +1532,7 @@ class ModelFormBasicTests(TestCase):
<li>Slug: <input type="text" name="slug" maxlength="50" required></li>
<li>Pub date: <input type="text" name="pub_date" required></li>
<li>Writer: <select name="writer" required>
- <option value="" selected>---------</option>
+ <option value="" selected>- Select an option -</option>
<option value="%s">Bob Woodward</option>
<option value="%s">Mike Royko</option>
</select></li>
@@ -1543,7 +1544,7 @@ class ModelFormBasicTests(TestCase):
<option value="%s">Third test</option>
</select></li>
<li>Status: <select name="status">
- <option value="" selected>---------</option>
+ <option value="" selected>- Select an option -</option>
<option value="1">Draft</option>
<option value="2">Pending</option>
<option value="3">Live</option>
@@ -1585,7 +1586,7 @@ class ModelFormBasicTests(TestCase):
<li>Pub date:
<input type="text" name="pub_date" value="1988-01-04" required></li>
<li>Writer: <select name="writer" required>
- <option value="">---------</option>
+ <option value="">- Select an option -</option>
<option value="%s">Bob Woodward</option>
<option value="%s" selected>Mike Royko</option>
</select></li>
@@ -1597,7 +1598,7 @@ class ModelFormBasicTests(TestCase):
<option value="%s">Third test</option>
</select></li>
<li>Status: <select name="status">
- <option value="" selected>---------</option>
+ <option value="" selected>- Select an option -</option>
<option value="1">Draft</option>
<option value="2">Pending</option>
<option value="3">Live</option>
@@ -1731,7 +1732,7 @@ class ModelFormBasicTests(TestCase):
</div>
<div>Writer:
<select name="writer" required>
- <option value="" selected>---------</option>
+ <option value="" selected>- Select an option -</option>
<option value="%s">Bob Woodward</option>
<option value="%s">Mike Royko</option>
</select>
@@ -1748,7 +1749,7 @@ class ModelFormBasicTests(TestCase):
</div>
<div>Status:
<select name="status">
- <option value="" selected>---------</option>
+ <option value="" selected>- Select an option -</option>
<option value="1">Draft</option><option value="2">Pending</option>
<option value="3">Live</option>
</select>
@@ -1781,7 +1782,7 @@ class ModelFormBasicTests(TestCase):
<li>Pub date:
<input type="text" name="pub_date" value="1988-01-04" required></li>
<li>Writer: <select name="writer" required>
- <option value="">---------</option>
+ <option value="">- Select an option -</option>
<option value="%s">Bob Woodward</option>
<option value="%s" selected>Mike Royko</option>
</select></li>
@@ -1793,7 +1794,7 @@ class ModelFormBasicTests(TestCase):
<option value="%s">Third test</option>
</select></li>
<li>Status: <select name="status">
- <option value="" selected>---------</option>
+ <option value="" selected>- Select an option -</option>
<option value="1">Draft</option>
<option value="2">Pending</option>
<option value="3">Live</option>
@@ -1957,7 +1958,7 @@ class ModelFormBasicTests(TestCase):
'<li>Slug: <input type="text" name="slug" maxlength="50" required></li>'
'<li>Pub date: <input type="text" name="pub_date" required></li>'
'<li>Writer: <select name="writer" required>'
- '<option value="" selected>---------</option>'
+ '<option value="" selected>- Select an option -</option>'
'<option value="%s">Bob Woodward</option>'
'<option value="%s">Mike Royko</option>'
"</select></li>"
@@ -1969,7 +1970,7 @@ class ModelFormBasicTests(TestCase):
'<option value="%s">Third test</option>'
"</select> </li>"
'<li>Status: <select name="status">'
- '<option value="" selected>---------</option>'
+ '<option value="" selected>- Select an option -</option>'
'<option value="1">Draft</option>'
'<option value="2">Pending</option>'
'<option value="3">Live</option>'
@@ -1986,7 +1987,7 @@ class ModelFormBasicTests(TestCase):
'<li>Slug: <input type="text" name="slug" maxlength="50" required></li>'
'<li>Pub date: <input type="text" name="pub_date" required></li>'
'<li>Writer: <select name="writer" required>'
- '<option value="" selected>---------</option>'
+ '<option value="" selected>- Select an option -</option>'
'<option value="%s">Bob Woodward</option>'
'<option value="%s">Carl Bernstein</option>'
'<option value="%s">Mike Royko</option>'
@@ -2000,7 +2001,7 @@ class ModelFormBasicTests(TestCase):
'<option value="%s">Fourth</option>'
"</select></li>"
'<li>Status: <select name="status">'
- '<option value="" selected>---------</option>'
+ '<option value="" selected>- Select an option -</option>'
'<option value="1">Draft</option>'
'<option value="2">Pending</option>'
'<option value="3">Live</option>'
@@ -2044,7 +2045,7 @@ class ModelFormBasicTests(TestCase):
self.assertEqual(call_count, 0)
self.assertEqual(
form.fields["animal"].choices,
- models.BLANK_CHOICE_DASH + [("LION", "Lion"), ("ZEBRA", "Zebra")],
+ [("", get_blank_choice_label())] + [("LION", "Lion"), ("ZEBRA", "Zebra")],
)
self.assertEqual(call_count, 1)
@@ -2410,7 +2411,7 @@ class ModelOneToOneFieldTests(TestCase):
"""
<p><label for="id_writer">Writer:</label>
<select name="writer" id="id_writer" required>
- <option value="" selected>---------</option>
+ <option value="" selected>- Select an option -</option>
<option value="%s">Bob Woodward</option>
<option value="%s">Mike Royko</option>
</select></p>
@@ -2437,7 +2438,7 @@ class ModelOneToOneFieldTests(TestCase):
"""
<p><label for="id_writer">Writer:</label>
<select name="writer" id="id_writer" required>
- <option value="">---------</option>
+ <option value="">- Select an option -</option>
<option value="%s" selected>Bob Woodward</option>
<option value="%s">Mike Royko</option>
</select></p>
@@ -2727,7 +2728,8 @@ class FileAndImageFieldTests(TestCase):
form = FPForm()
self.assertEqual(
- [name for _, name in form["path"].field.choices], ["---------", "models.py"]
+ [name for _, name in form["path"].field.choices],
+ [get_blank_choice_label(), "models.py"],
)
@skipUnless(test_images, "Pillow not installed")
@@ -3027,7 +3029,7 @@ class OtherModelFormTests(TestCase):
self.assertEqual(
tuple(field.choices),
(
- ("", "---------"),
+ ("", get_blank_choice_label()),
(multicolor_item.pk, "blue, red"),
(red_item.pk, "red"),
),
@@ -3041,14 +3043,19 @@ class OtherModelFormTests(TestCase):
field = forms.ModelChoiceField(Inventory.objects.all(), to_field_name="barcode")
self.assertEqual(
tuple(field.choices),
- (("", "---------"), (86, "Apple"), (87, "Core"), (22, "Pear")),
+ (
+ ("", get_blank_choice_label()),
+ (86, "Apple"),
+ (87, "Core"),
+ (22, "Pear"),
+ ),
)
form = InventoryForm(instance=core)
self.assertHTMLEqual(
str(form["parent"]),
"""<select name="parent" id="id_parent">
-<option value="">---------</option>
+<option value="">- Select an option -</option>
<option value="86" selected>Apple</option>
<option value="87">Core</option>
<option value="22">Pear</option>
generated by cgit v1.3 (git 2.53.0) at 2026-05-01 19:34:21 +0000