mirror of
https://github.com/django/django.git
synced 2025-10-26 07:06:08 +00:00
[1.7.x] Fixed #22477 -- Removed contrib middleware from the global settings defaults.
Also added a compatibility check for changed middleware defaults.
This commit is contained in:
@@ -56,6 +56,14 @@ ALWAYS_INSTALLED_APPS = [
|
||||
'servers.another_app',
|
||||
]
|
||||
|
||||
ALWAYS_MIDDLEWARE_CLASSES = (
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'django.middleware.csrf.CsrfViewMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
'django.contrib.messages.middleware.MessageMiddleware',
|
||||
)
|
||||
|
||||
|
||||
def get_test_modules():
|
||||
from django.contrib.gis.tests.utils import HAS_SPATIAL_DB
|
||||
@@ -107,6 +115,7 @@ def setup(verbosity, test_labels):
|
||||
'LANGUAGE_CODE': settings.LANGUAGE_CODE,
|
||||
'STATIC_URL': settings.STATIC_URL,
|
||||
'STATIC_ROOT': settings.STATIC_ROOT,
|
||||
'MIDDLEWARE_CLASSES': settings.MIDDLEWARE_CLASSES,
|
||||
}
|
||||
|
||||
# Redirect some settings for the duration of these tests.
|
||||
@@ -117,6 +126,9 @@ def setup(verbosity, test_labels):
|
||||
settings.TEMPLATE_DIRS = (os.path.join(RUNTESTS_DIR, TEST_TEMPLATE_DIR),)
|
||||
settings.LANGUAGE_CODE = 'en'
|
||||
settings.SITE_ID = 1
|
||||
settings.MIDDLEWARE_CLASSES = ALWAYS_MIDDLEWARE_CLASSES
|
||||
# Ensure the middleware classes are seen as overridden otherwise we get a compatibility warning.
|
||||
settings._explicit_settings.add('MIDDLEWARE_CLASSES')
|
||||
|
||||
if verbosity > 0:
|
||||
# Ensure any warnings captured to logging are piped through a verbose
|
||||
|
||||
Reference in New Issue
Block a user