diff --git a/testsettings.py b/testsettings.py index 104e585..372c23a 100644 --- a/testsettings.py +++ b/testsettings.py @@ -16,20 +16,16 @@ DEBUG = True SECRET_KEY = 'xx' STATIC_URL = '/static/' INSTALLED_APPS = ('mellon', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions') -if hasattr(global_settings, 'MIDDLEWARE_CLASSES'): - MIDDLEWARE_CLASSES = global_settings.MIDDLEWARE_CLASSES - MIDDLEWARE_CLASSES += ( - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'mellon.middleware.PassiveAuthenticationMiddleware', - ) -else: - MIDDLEWARE = global_settings.MIDDLEWARE - MIDDLEWARE += ( - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'mellon.middleware.PassiveAuthenticationMiddleware', - ) +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'mellon.middleware.PassiveAuthenticationMiddleware', +] AUTHENTICATION_BACKENDS = ('mellon.backends.SAMLBackend',) ROOT_URLCONF = 'urls_tests'