Skip to content

Commit 73080e1

Browse files
committed
Allow tests to pass with Django 2.0
Django 2.0 has removed the deprecated setting MIDDLEWARE_CLASSES. Use MIDDLEWARE instead. As a result, adjust the the expected warnings during test as system check warning 1_10.W001 was removed.
1 parent 36e2e4c commit 73080e1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

tests/settings.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
MEDIA_URL = '/media/' # Avoids https://code.djangoproject.com/ticket/21451
3232

33-
MIDDLEWARE_CLASSES = [
33+
MIDDLEWARE = [
3434
'debug_toolbar.middleware.DebugToolbarMiddleware',
3535
'django.middleware.security.SecurityMiddleware',
3636
'django.contrib.sessions.middleware.SessionMiddleware',
@@ -40,6 +40,8 @@
4040
'django.contrib.messages.middleware.MessageMiddleware',
4141
'django.middleware.clickjacking.XFrameOptionsMiddleware',
4242
]
43+
# Django < 1.10
44+
MIDDLEWARE_CLASSES = MIDDLEWARE
4345

4446
ROOT_URLCONF = 'tests.urls'
4547

tests/test_integration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def test_check_gzip_middleware_error(self):
375375
def test_middleware_factory_functions_supported(self):
376376
messages = run_checks()
377377

378-
if django.VERSION[:2] < (1, 10):
378+
if django.VERSION[:2] < (1, 10) or django.VERSION[:2] >= (2, 0):
379379
self.assertEqual(messages, [])
380380
else:
381381
self.assertEqual(messages[0].id, '1_10.W001')

0 commit comments

Comments
 (0)