summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2011-01-27 02:28:53 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2011-01-27 02:28:53 +0000
commit456b8a9d0c3c4cbff2e3d88b659c6e4e3e6c7def (patch)
tree231ecb67efef6d959f2496e97b90a648633edce5 /tests
parent701204254478a03fd95a2508be7f1f47bcebae43 (diff)
Fixed #14818 -- Added explicit tests for the way that the cycle tag handles escaping. Thanks to steveire.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/templates/tests.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index 08957b0417..397f88943e 100644
--- a/tests/regressiontests/templates/tests.py
+++ b/tests/regressiontests/templates/tests.py
@@ -693,6 +693,8 @@ class Templates(unittest.TestCase):
'cycle17': ("{% cycle 'a' 'b' 'c' as abc silent %}{% cycle abc %}{% cycle abc %}{% cycle abc %}{% cycle abc %}", {}, "abca"),
'cycle18': ("{% cycle 'a' 'b' 'c' as foo invalid_flag %}", {}, template.TemplateSyntaxError),
'cycle19': ("{% cycle 'a' 'b' as silent %}{% cycle silent %}", {}, "ab"),
+ 'cycle20': ("{% cycle one two as foo %} &amp; {% cycle foo %}", {'one' : 'A & B', 'two' : 'C & D'}, "A & B &amp; C & D"),
+ 'cycle21': ("{% filter force_escape %}{% cycle one two as foo %} & {% cycle foo %}{% endfilter %}", {'one' : 'A & B', 'two' : 'C & D'}, "A &amp; B &amp; C &amp; D"),
### EXCEPTIONS ############################################################