From a3830f6d663aee9e91871002cbff7c57aee6d989 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 7 Aug 2015 07:18:55 -0400 Subject: Refs #25236 -- Removed ifequal/ifnotequal usage. --- tests/template_tests/syntax_tests/test_extends.py | 8 ++++---- tests/template_tests/syntax_tests/test_i18n.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/template_tests/syntax_tests') diff --git a/tests/template_tests/syntax_tests/test_extends.py b/tests/template_tests/syntax_tests/test_extends.py index 3e65f4bf90..46600cb76c 100644 --- a/tests/template_tests/syntax_tests/test_extends.py +++ b/tests/template_tests/syntax_tests/test_extends.py @@ -42,7 +42,7 @@ inheritance_templates = { 'inheritance30': "1{% if optional %}{% block opt %}2{% endblock %}{% endif %}3", 'inheritance31': "{% extends 'inheritance30' %}{% block opt %}two{% endblock %}", 'inheritance32': "{% extends 'inheritance30' %}{% block opt %}two{% endblock %}", - 'inheritance33': "1{% ifequal optional 1 %}{% block opt %}2{% endblock %}{% endifequal %}3", + 'inheritance33': "1{% if optional == 1 %}{% block opt %}2{% endblock %}{% endif %}3", 'inheritance34': "{% extends 'inheritance33' %}{% block opt %}two{% endblock %}", 'inheritance35': "{% extends 'inheritance33' %}{% block opt %}two{% endblock %}", 'inheritance36': "{% for n in numbers %}_{% block opt %}{{ n }}{% endblock %}{% endfor %}_", @@ -322,7 +322,7 @@ class InheritanceTests(SimpleTestCase): @setup(inheritance_templates) def test_inheritance33(self): """ - Base template, putting block in a conditional {% ifequal %} tag + Base template, putting block in a conditional {% if %} tag """ output = self.engine.render_to_string('inheritance33', {'optional': 1}) self.assertEqual(output, '123') @@ -330,7 +330,7 @@ class InheritanceTests(SimpleTestCase): @setup(inheritance_templates) def test_inheritance34(self): """ - Inherit from a template with block wrapped in an {% ifequal %} tag + Inherit from a template with block wrapped in an {% if %} tag (in parent), still gets overridden """ output = self.engine.render_to_string('inheritance34', {'optional': 1}) @@ -339,7 +339,7 @@ class InheritanceTests(SimpleTestCase): @setup(inheritance_templates) def test_inheritance35(self): """ - Inherit from a template with block wrapped in an {% ifequal %} tag + Inherit from a template with block wrapped in an {% if %} tag (in parent), still gets overridden """ output = self.engine.render_to_string('inheritance35', {'optional': 2}) diff --git a/tests/template_tests/syntax_tests/test_i18n.py b/tests/template_tests/syntax_tests/test_i18n.py index 68b5793a57..6013251366 100644 --- a/tests/template_tests/syntax_tests/test_i18n.py +++ b/tests/template_tests/syntax_tests/test_i18n.py @@ -141,7 +141,7 @@ class I18nTagTests(SimpleTestCase): @setup({'i18n12': '{% load i18n %}' '{% get_available_languages as langs %}{% for lang in langs %}' - '{% ifequal lang.0 "de" %}{{ lang.0 }}{% endifequal %}{% endfor %}'}) + '{% if lang.0 == "de" %}{{ lang.0 }}{% endif %}{% endfor %}'}) def test_i18n12(self): """ usage of the get_available_languages tag -- cgit v1.3