summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/raw_query/tests.py2
-rw-r--r--tests/template_tests/syntax_tests/test_if_changed.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/raw_query/tests.py b/tests/raw_query/tests.py
index 802b06a30b..fdc16823c1 100644
--- a/tests/raw_query/tests.py
+++ b/tests/raw_query/tests.py
@@ -33,7 +33,7 @@ class RawQueryTests(TestCase):
)
cls.b3 = Book.objects.create(
title='Another awesome book', author=cls.a1, paperback=False,
- opening_line='A squat grey building of only thirty-four stories.',
+ opening_line='A squat gray building of only thirty-four stories.',
)
cls.b4 = Book.objects.create(
title='Some other book', author=cls.a3, paperback=True,
diff --git a/tests/template_tests/syntax_tests/test_if_changed.py b/tests/template_tests/syntax_tests/test_if_changed.py
index 5ea6b0dcf4..fd48a42389 100644
--- a/tests/template_tests/syntax_tests/test_if_changed.py
+++ b/tests/template_tests/syntax_tests/test_if_changed.py
@@ -125,11 +125,11 @@ class IfChangedTagTests(SimpleTestCase):
self.assertEqual(output, '1-first,1-other,2-first,2-other,2-other,3-first,')
@setup({'ifchanged-else02': '{% for id in ids %}{{ id }}-'
- '{% ifchanged id %}{% cycle "red" "blue" %}{% else %}grey{% endifchanged %}'
+ '{% ifchanged id %}{% cycle "red" "blue" %}{% else %}gray{% endifchanged %}'
',{% endfor %}'})
def test_ifchanged_else02(self):
output = self.engine.render_to_string('ifchanged-else02', {'ids': [1, 1, 2, 2, 2, 3]})
- self.assertEqual(output, '1-red,1-grey,2-blue,2-grey,2-grey,3-red,')
+ self.assertEqual(output, '1-red,1-gray,2-blue,2-gray,2-gray,3-red,')
@setup({'ifchanged-else03': '{% for id in ids %}{{ id }}'
'{% ifchanged id %}-{% cycle "red" "blue" %}{% else %}{% endifchanged %}'