mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.8.x] Moved TemplateTagLoading cases into test_custom.

Browse Source 
Backport of ff67ce5076 from master
This commit is contained in:
Preston Timmons
2015-02-21 13:13:26 -06:00
committed by Tim Graham
parent 272208c124
commit c1bf9e47ec
2 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/template_tests/tests.py
View File

@@ -12,8 +12,7 @@ from django.template import (
Context, RequestContext, Template, TemplateSyntaxError,
base as template_base, engines, loader,
)
from django.test import RequestFactory, SimpleTestCase
from django.test.utils import extend_sys_path, override_settings
from django.test import RequestFactory, SimpleTestCase, override_settings
from django.utils._os import upath
TEMPLATES_DIR = os.path.join(os.path.dirname(upath(__file__)), 'templates')
@@ -183,42 +182,6 @@ class TemplateRegressionTests(SimpleTestCase):
self.assertEqual(child.render({'parent': parent}), 'child')
class TemplateTagLoading(SimpleTestCase):
def setUp(self):
self.egg_dir = '%s/eggs' % os.path.dirname(upath(__file__))
def test_load_error(self):
ttext = "{% load broken_tag %}"
self.assertRaises(template.TemplateSyntaxError, template.Template, ttext)
try:
template.Template(ttext)
except template.TemplateSyntaxError as e:
self.assertIn('ImportError', e.args[0])
self.assertIn('Xtemplate', e.args[0])
def test_load_error_egg(self):
ttext = "{% load broken_egg %}"
egg_name = '%s/tagsegg.egg' % self.egg_dir
with extend_sys_path(egg_name):
with self.assertRaises(template.TemplateSyntaxError):
with self.settings(INSTALLED_APPS=['tagsegg']):
template.Template(ttext)
try:
with self.settings(INSTALLED_APPS=['tagsegg']):
template.Template(ttext)
except template.TemplateSyntaxError as e:
self.assertIn('ImportError', e.args[0])
self.assertIn('Xtemplate', e.args[0])
def test_load_working_egg(self):
ttext = "{% load working_egg %}"
egg_name = '%s/tagsegg.egg' % self.egg_dir
with extend_sys_path(egg_name):
with self.settings(INSTALLED_APPS=['tagsegg']):
template.Template(ttext)
class RequestContextTests(unittest.TestCase):
def setUp(self):