Django 2.0 changes to tests

Martin Pauly · Martin Pauly · commit eb82ab179c44 · 2018-02-12T09:30:35.000+01:00
diff --git a/test_haystack/core/urls.py b/test_haystack/core/urls.py
@@ -13,7 +13,7 @@
 
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
     url(r'^$', SearchView(load_all=False), name='haystack_search'),
     url(r'^faceted/$',
@@ -23,5 +23,5 @@
 ]
 
 urlpatterns += [
-    url(r'', include('test_haystack.test_app_without_models.urls', namespace='app-without-models')),
+    url(r'', include(('test_haystack.test_app_without_models.urls', 'app-without-models'))),
 ]
diff --git a/test_haystack/settings.py b/test_haystack/settings.py
@@ -51,12 +51,11 @@
     },
 ]
 
-MIDDLEWARE_CLASSES = [
+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',
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`
`15`	`15`	`urlpatterns = [`
`16`		`- url(r'^admin/', include(admin.site.urls)),`
	`16`	`+ url(r'^admin/', admin.site.urls),`
`17`	`17`
`18`	`18`	`url(r'^$', SearchView(load_all=False), name='haystack_search'),`
`19`	`19`	`url(r'^faceted/$',`
`@@ -23,5 +23,5 @@`
`23`	`23`	`]`
`24`	`24`
`25`	`25`	`urlpatterns += [`
`26`		`- url(r'', include('test_haystack.test_app_without_models.urls', namespace='app-without-models')),`
	`26`	`+ url(r'', include(('test_haystack.test_app_without_models.urls', 'app-without-models'))),`
`27`	`27`	`]`
Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,11 @@`
`51`	`51`	`},`
`52`	`52`	`]`
`53`	`53`
`54`		`-MIDDLEWARE_CLASSES = [`
	`54`	`+MIDDLEWARE = [`
`55`	`55`	`'django.middleware.common.CommonMiddleware',`
`56`	`56`	`'django.contrib.sessions.middleware.SessionMiddleware',`
`57`	`57`	`'django.middleware.csrf.CsrfViewMiddleware',`
`58`	`58`	`'django.contrib.auth.middleware.AuthenticationMiddleware',`
`59`		`- 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',`
`60`	`59`	`'django.contrib.messages.middleware.MessageMiddleware',`
`61`	`60`	`]`
`62`	`61`