p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moved test_token_smart_split into ParserTests.

This commit is contained in:
Preston Timmons 2015-02-21 13:20:20 -06:00 committed by Aymeric Augustin
parent 3d8fee6051
commit 25a0b5cdcd
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/template_tests/test_parser.py
View File

@ -7,13 +7,22 @@ from unittest import TestCase
from django.template import Library, Template, TemplateSyntaxError from django.template import Library, Template, TemplateSyntaxError
from django.template.base import ( from django.template.base import (
FilterExpression, Parser, TokenParser, Variable, TOKEN_BLOCK, FilterExpression, Parser, Token, TokenParser, Variable,
) )
from django.test import override_settings from django.test import override_settings
from django.utils import six from django.utils import six
class ParserTests(TestCase): class ParserTests(TestCase):
def test_token_smart_split(self):
"""
#7027 -- _() syntax should work with spaces
"""
token = Token(TOKEN_BLOCK, 'sometag _("Page not found") value|yesno:_("yes,no")')
split = token.split_contents()
self.assertEqual(split, ["sometag", '_("Page not found")', 'value|yesno:_("yes,no")'])
def test_token_parsing(self): def test_token_parsing(self):
# Tests for TokenParser behavior in the face of quoted strings with # Tests for TokenParser behavior in the face of quoted strings with
# spaces. # spaces.

9
tests/template_tests/tests.py
View File

@ -7,8 +7,7 @@ import sys
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
from django.core import urlresolvers from django.core import urlresolvers
from django.template import ( from django.template import (
Context, Template, TemplateSyntaxError, base as template_base, engines, Context, Template, TemplateSyntaxError, engines, loader,
loader,
) )
from django.test import SimpleTestCase, override_settings from django.test import SimpleTestCase, override_settings
from django.utils._os import upath from django.utils._os import upath
@ -26,12 +25,6 @@ class TemplateTests(SimpleTestCase):
class TemplateRegressionTests(SimpleTestCase): class TemplateRegressionTests(SimpleTestCase):
def test_token_smart_split(self):
# Regression test for #7027
token = template_base.Token(template_base.TOKEN_BLOCK, 'sometag _("Page not found") value|yesno:_("yes,no")')
split = token.split_contents()
self.assertEqual(split, ["sometag", '_("Page not found")', 'value|yesno:_("yes,no")'])
@override_settings(SETTINGS_MODULE=None, DEBUG=True) @override_settings(SETTINGS_MODULE=None, DEBUG=True)
def test_url_reverse_no_settings_module(self): def test_url_reverse_no_settings_module(self):
# Regression test for #9005 # Regression test for #9005