diff --git a/.gitignore b/.gitignore index 16914b0..84bbba5 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ tests/sandbox/assets node_modules .DS_Store + +.pytest_cache/ diff --git a/setup.py b/setup.py index e5af273..4b0e9ae 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ tests_require = [ 'pytest-pythonpath==0.7.2', 'pytest-sugar==0.9.1', 'pytest==3.4.2', - 'wagtail_factories==0.3.0', + 'wagtail_factories==git+https://github.com/mvantellingen/wagtail-factories.git@master', ] docs_require = [ diff --git a/tests/settings.py b/tests/settings.py index bf753ce..5f41fd7 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -56,25 +56,17 @@ TEMPLATES = [ }, ] -def get_middleware_settings(): - return ( +MIDDLEWARE = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'wagtail.core.middleware.SiteMiddleware', ) -# Django 1.10 started to use "MIDDLEWARE" instead of "MIDDLEWARE_CLASSES". -if V(django.get_version()) < V('1.10'): - MIDDLEWARE_CLASSES = get_middleware_settings() -else: - MIDDLEWARE = get_middleware_settings() - INSTALLED_APPS = ( 'wagtail_personalisation', diff --git a/tests/site/urls.py b/tests/site/urls.py index a47bb5a..b13e9cb 100644 --- a/tests/site/urls.py +++ b/tests/site/urls.py @@ -7,7 +7,7 @@ from wagtail.core import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls urlpatterns = [ - url(r'^django-admin/', include(admin.site.urls)), + url(r'^django-admin/', admin.site.urls), url(r'^admin/', include(wagtailadmin_urls)), url(r'^documents/', include(wagtaildocs_urls)),