Skip to content

Commit 6b7c0b2

Browse files
committed
Fix OAuth2 backend middleware test on Django 2.0
Fixes #449
1 parent 14b8309 commit 6b7c0b2

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

oauth2_provider/tests/test_auth_backends.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from django.conf.global_settings import MIDDLEWARE_CLASSES
21
from django.contrib.auth import get_user_model
32
from django.contrib.auth.models import AnonymousUser
43
from django.test import TestCase, RequestFactory
@@ -10,6 +9,12 @@
109
from ..models import AccessToken
1110
from ..backends import OAuth2Backend
1211
from ..middleware import OAuth2TokenMiddleware
12+
try:
13+
# Django<1.10 compatibility
14+
from django.conf.global_settings import MIDDLEWARE_CLASSES as MIDDLEWARE
15+
except ImportError:
16+
from django.conf.global_settings import MIDDLEWARE
17+
1318

1419
UserModel = get_user_model()
1520
ApplicationModel = get_application_model()
@@ -76,7 +81,9 @@ def test_get_user(self):
7681
'oauth2_provider.backends.OAuth2Backend',
7782
'django.contrib.auth.backends.ModelBackend',
7883
),
79-
MIDDLEWARE_CLASSES=tuple(MIDDLEWARE_CLASSES) + ('oauth2_provider.middleware.OAuth2TokenMiddleware',)
84+
MIDDLEWARE=tuple(MIDDLEWARE) + ('oauth2_provider.middleware.OAuth2TokenMiddleware',),
85+
# Django<1.10 compat:
86+
MIDDLEWARE_CLASSES=tuple(MIDDLEWARE) + ('oauth2_provider.middleware.OAuth2TokenMiddleware',)
8087
)
8188
class TestOAuth2Middleware(BaseTest):
8289

0 commit comments

Comments
 (0)