summaryrefslogtreecommitdiff
path: root/tests/regressiontests/templates
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2009-06-18 15:03:17 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2009-06-18 15:03:17 +0000
commit8950a40ceccbdccd5ba5c3f788e5a3a3b7d0638f (patch)
tree6e3d37259a5d7eedbf878499c04240613cc28f04 /tests/regressiontests/templates
parentb836ed46665c99228f2f4109139296f8e48551d0 (diff)
Fixed #11270 -- Corrected naming conflict in templatetag test. Thanks to steveire for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/templates')
-rw-r--r--tests/regressiontests/templates/tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index 953e8faa1a..901ef39796 100644
--- a/tests/regressiontests/templates/tests.py
+++ b/tests/regressiontests/templates/tests.py
@@ -69,7 +69,7 @@ class SomeException(Exception):
class SomeOtherException(Exception):
pass
-
+
class ContextStackException(Exception):
pass
@@ -629,7 +629,7 @@ class Templates(unittest.TestCase):
# Logically the same as above, just written with explicit
# ifchanged for the day.
- 'ifchanged-param04': ('{% for d in days %}{% ifchanged d.day %}{{ d.day }}{% endifchanged %}{% for h in d.hours %}{% ifchanged d.day h %}{{ h }}{% endifchanged %}{% endfor %}{% endfor %}', {'days':[{'day':1, 'hours':[1,2,3]},{'day':2, 'hours':[3]},] }, '112323'),
+ 'ifchanged-param05': ('{% for d in days %}{% ifchanged d.day %}{{ d.day }}{% endifchanged %}{% for h in d.hours %}{% ifchanged d.day h %}{{ h }}{% endifchanged %}{% endfor %}{% endfor %}', {'days':[{'day':1, 'hours':[1,2,3]},{'day':2, 'hours':[3]},] }, '112323'),
# Test the else clause of ifchanged.
'ifchanged-else01': ('{% for id in ids %}{{ id }}{% ifchanged id %}-first{% else %}-other{% endifchanged %},{% endfor %}', {'ids': [1,1,2,2,2,3]}, '1-first,1-other,2-first,2-other,2-other,3-first,'),