Commit 8e129b42 authored by Preston Timmons's avatar Preston Timmons Committed by Aymeric Augustin
Browse files

Cleaned up template directory handling in template tests.

parent 32c108a2

tests/template_tests/test_response.py

+3 −3
Original line number Diff line number Diff line 
from __future__ import unicode_literals



import os

import pickle

import time

from datetime import datetime
@@ -14,9 +13,10 @@ from django.test import ( 
    RequestFactory, SimpleTestCase, ignore_warnings, override_settings,

)

from django.test.utils import require_jinja2

from django.utils._os import upath

from django.utils.deprecation import RemovedInDjango20Warning



from .utils import TEMPLATE_DIR





def test_processor(request):

    return {'processors': 'yes'}
@@ -224,7 +224,7 @@ class SimpleTemplateResponseTest(SimpleTestCase): 


@override_settings(TEMPLATES=[{

    'BACKEND': 'django.template.backends.django.DjangoTemplates',

    'DIRS': [os.path.join(os.path.dirname(upath(__file__)), 'templates')],

    'DIRS': [TEMPLATE_DIR],

    'OPTIONS': {

        'context_processors': [test_processor_name],

    },

tests/template_tests/tests.py

+0 −4
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

from __future__ import unicode_literals



import os

import sys



from django.contrib.auth.models import Group
@@ -10,9 +9,6 @@ from django.template import ( 
    Context, Template, TemplateSyntaxError, engines, loader,

)

from django.test import SimpleTestCase, override_settings

from django.utils._os import upath



TEMPLATES_DIR = os.path.join(os.path.dirname(upath(__file__)), 'templates')





class TemplateTests(SimpleTestCase):