From 87cd93587e35c05276098b6bfada5210b63c03ce Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 2 Apr 2015 15:52:09 +0100 Subject: [PATCH] Use TEMPLATES setting in tests --- wagtail/tests/settings.py | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index d28765a6d5..a03b9d8873 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -1,5 +1,6 @@ import os +import django from django.conf import global_settings @@ -34,9 +35,27 @@ STATICFILES_FINDERS = ( USE_TZ = True -TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( - 'django.core.context_processors.request', -) +if django.VERSION >= (1, 8): + TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + 'django.template.context_processors.request', + ], + }, + }, + ] +else: + TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( + 'django.core.context_processors.request', + ) MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware',