summaryrefslogtreecommitdiff
path: root/tests/model_forms
diff options
context:
space:
mode:
authorAdam Johnson <me@adamj.eu>2025-04-15 14:24:12 +0100
committerSarah Boyce <42296566+sarahboyce@users.noreply.github.com>2025-04-16 10:21:38 +0200
commit6ef0f5bc272b316f0fd6fa706d7eaf8f1822faa4 (patch)
tree499b867d39644712dd26643bbe1fa5a9da518248 /tests/model_forms
parent494d2dc316fc1d849b6a1af97575d293f856a84c (diff)
Americanized some spellings.
Diffstat (limited to 'tests/model_forms')
-rw-r--r--tests/model_forms/models.py6
-rw-r--r--tests/model_forms/tests.py46
2 files changed, 26 insertions, 26 deletions
diff --git a/tests/model_forms/models.py b/tests/model_forms/models.py
index 4111fafd69..6d984379f0 100644
--- a/tests/model_forms/models.py
+++ b/tests/model_forms/models.py
@@ -374,7 +374,7 @@ class FlexibleDatePost(models.Model):
posted = models.DateField(blank=True, null=True)
-class Colour(models.Model):
+class Color(models.Model):
name = models.CharField(max_length=50)
def __iter__(self):
@@ -384,9 +384,9 @@ class Colour(models.Model):
return self.name
-class ColourfulItem(models.Model):
+class ColorfulItem(models.Model):
name = models.CharField(max_length=50)
- colours = models.ManyToManyField(Colour)
+ colors = models.ManyToManyField(Color)
class CustomErrorMessage(models.Model):
diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py
index 837466f07f..59e5ee0242 100644
--- a/tests/model_forms/tests.py
+++ b/tests/model_forms/tests.py
@@ -38,8 +38,8 @@ from .models import (
Book,
Category,
Character,
- Colour,
- ColourfulItem,
+ Color,
+ ColorfulItem,
ConstraintsModel,
CustomErrorMessage,
CustomFF,
@@ -2998,18 +2998,18 @@ class OtherModelFormTests(TestCase):
"""
ModelChoiceField should respect a prefetch_related() on its queryset.
"""
- blue = Colour.objects.create(name="blue")
- red = Colour.objects.create(name="red")
- multicolor_item = ColourfulItem.objects.create()
- multicolor_item.colours.add(blue, red)
- red_item = ColourfulItem.objects.create()
- red_item.colours.add(red)
+ blue = Color.objects.create(name="blue")
+ red = Color.objects.create(name="red")
+ multicolor_item = ColorfulItem.objects.create()
+ multicolor_item.colors.add(blue, red)
+ red_item = ColorfulItem.objects.create()
+ red_item.colors.add(red)
class ColorModelChoiceField(forms.ModelChoiceField):
def label_from_instance(self, obj):
- return ", ".join(c.name for c in obj.colours.all())
+ return ", ".join(c.name for c in obj.colors.all())
- field = ColorModelChoiceField(ColourfulItem.objects.prefetch_related("colours"))
+ field = ColorModelChoiceField(ColorfulItem.objects.prefetch_related("colors"))
# CPython < 3.14 calls ModelChoiceField.__len__() when coercing to
# tuple. PyPy and Python 3.14+ don't call __len__() and so .count()
# isn't called on the QuerySet. The following would trigger an extra
@@ -3091,13 +3091,13 @@ class OtherModelFormTests(TestCase):
)
def test_iterable_model_m2m(self):
- class ColourfulItemForm(forms.ModelForm):
+ class ColorfulItemForm(forms.ModelForm):
class Meta:
- model = ColourfulItem
+ model = ColorfulItem
fields = "__all__"
- colour = Colour.objects.create(name="Blue")
- form = ColourfulItemForm()
+ color = Color.objects.create(name="Blue")
+ form = ColorfulItemForm()
self.maxDiff = 1024
self.assertHTMLEqual(
form.as_p(),
@@ -3105,12 +3105,12 @@ class OtherModelFormTests(TestCase):
<p>
<label for="id_name">Name:</label>
<input id="id_name" type="text" name="name" maxlength="50" required></p>
- <p><label for="id_colours">Colours:</label>
- <select multiple name="colours" id="id_colours" required>
+ <p><label for="id_colors">Colors:</label>
+ <select multiple name="colors" id="id_colors" required>
<option value="%(blue_pk)s">Blue</option>
</select></p>
"""
- % {"blue_pk": colour.pk},
+ % {"blue_pk": color.pk},
)
def test_callable_field_default(self):
@@ -3709,13 +3709,13 @@ class StrictAssignmentTests(SimpleTestCase):
class ModelToDictTests(TestCase):
def test_many_to_many(self):
"""Data for a ManyToManyField is a list rather than a lazy QuerySet."""
- blue = Colour.objects.create(name="blue")
- red = Colour.objects.create(name="red")
- item = ColourfulItem.objects.create()
- item.colours.set([blue])
- data = model_to_dict(item)["colours"]
+ blue = Color.objects.create(name="blue")
+ red = Color.objects.create(name="red")
+ item = ColorfulItem.objects.create()
+ item.colors.set([blue])
+ data = model_to_dict(item)["colors"]
self.assertEqual(data, [blue])
- item.colours.set([red])
+ item.colors.set([red])
# If data were a QuerySet, it would be reevaluated here and give "red"
# instead of the original value.
self.assertEqual(data, [blue])