diff --git a/tests/settings.py b/tests/settings.py index a9de290b4..6ea78f3f8 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -30,7 +30,7 @@ MEDIA_URL = '/media/' # Avoids https://code.djangoproject.com/ticket/21451 -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -40,6 +40,8 @@ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] +# Django < 1.10 +MIDDLEWARE_CLASSES = MIDDLEWARE ROOT_URLCONF = 'tests.urls' diff --git a/tests/test_integration.py b/tests/test_integration.py index f0d59737f..03d1f681a 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -375,7 +375,7 @@ def test_check_gzip_middleware_error(self): def test_middleware_factory_functions_supported(self): messages = run_checks() - if django.VERSION[:2] < (1, 10): + if django.VERSION[:2] < (1, 10) or django.VERSION[:2] >= (2, 0): self.assertEqual(messages, []) else: self.assertEqual(messages[0].id, '1_10.W001')