tests: update for compatibility with django 2.2 (#36330)
This commit is contained in:
parent
431577cc3e
commit
389e6d790b
|
@ -25,7 +25,11 @@ import lasso
|
|||
|
||||
from pytest import fixture
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
import django
|
||||
if django.VERSION >= (1, 11, 0):
|
||||
from django.urls import reverse
|
||||
else:
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.utils import six
|
||||
from django.utils.six.moves.urllib import parse as urlparse
|
||||
from django.utils.encoding import force_str
|
||||
|
|
|
@ -24,7 +24,11 @@ import random
|
|||
import hashlib
|
||||
from httmock import HTTMock
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
import django
|
||||
if django.VERSION >= (1, 11, 0):
|
||||
from django.urls import reverse
|
||||
else:
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.utils.encoding import force_text
|
||||
from django.utils.http import urlencode
|
||||
|
||||
|
|
|
@ -16,11 +16,19 @@ SECRET_KEY = 'xx'
|
|||
STATIC_URL = '/static/'
|
||||
INSTALLED_APPS = ('mellon', 'django.contrib.auth',
|
||||
'django.contrib.contenttypes', 'django.contrib.sessions')
|
||||
MIDDLEWARE_CLASSES = global_settings.MIDDLEWARE_CLASSES
|
||||
MIDDLEWARE_CLASSES += (
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
)
|
||||
if hasattr(global_settings, 'MIDDLEWARE_CLASSES'):
|
||||
MIDDLEWARE_CLASSES = global_settings.MIDDLEWARE_CLASSES
|
||||
MIDDLEWARE_CLASSES += (
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
)
|
||||
else:
|
||||
MIDDLEWARE = global_settings.MIDDLEWARE
|
||||
MIDDLEWARE += (
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
)
|
||||
|
||||
AUTHENTICATION_BACKENDS = (
|
||||
'mellon.backends.SAMLBackend',
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue