Refs #26601 -- Removed support for old-style middleware using settings.MIDDLEWARE_CLASSES.

2 files changed, 0 insertions, 74 deletions

diff --git a/tests/view_tests/tests/test_csrf.py b/tests/view_tests/tests/test_csrf.py
index 23dab04cd6..d0dd07b9e1 100644
--- a/tests/view_tests/tests/test_csrf.py
+++ b/tests/view_tests/tests/test_csrf.py
@@ -2,8 +2,6 @@ from django.template import TemplateDoesNotExist
 from django.test import (
     Client, RequestFactory, SimpleTestCase, override_settings,
 )
-from django.test.utils import ignore_warnings
-from django.utils.deprecation import RemovedInDjango20Warning
 from django.utils.translation import override
 from django.views.csrf import CSRF_FAILURE_TEMPLATE_NAME, csrf_failure
 
@@ -40,33 +38,6 @@ class CsrfViewTests(SimpleTestCase):
                                 "CSRF-verificatie mislukt. Verzoek afgebroken.",
                                 status_code=403)
 
-    @ignore_warnings(category=RemovedInDjango20Warning)
-    @override_settings(
-        USE_I18N=True,
-        MIDDLEWARE=None,
-        MIDDLEWARE_CLASSES=[
-            'django.middleware.locale.LocaleMiddleware',
-            'django.middleware.common.CommonMiddleware',
-            'django.middleware.csrf.CsrfViewMiddleware',
-        ],
-    )
-    def test_translation_middleware_classes(self):
-        """
-        An invalid request is rejected with a localized error message.
-        """
-        response = self.client.post('/')
-        self.assertContains(response, "Forbidden", status_code=403)
-        self.assertContains(response,
-                            "CSRF verification failed. Request aborted.",
-                            status_code=403)
-
-        with self.settings(LANGUAGE_CODE='nl'), override('en-us'):
-            response = self.client.post('/')
-            self.assertContains(response, "Verboden", status_code=403)
-            self.assertContains(response,
-                                "CSRF-verificatie mislukt. Verzoek afgebroken.",
-                                status_code=403)
-
     @override_settings(
         SECURE_PROXY_SSL_HEADER=('HTTP_X_FORWARDED_PROTO', 'https')
     )
diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py
index bde0ad42d4..725d72890e 100644
--- a/tests/view_tests/tests/test_i18n.py
+++ b/tests/view_tests/tests/test_i18n.py
@@ -10,11 +10,9 @@ from django.test import (
     SimpleTestCase, TestCase, modify_settings, override_settings,
 )
 from django.test.selenium import SeleniumTestCase
-from django.test.utils import ignore_warnings
 from django.urls import reverse
 from django.utils import six
 from django.utils._os import upath
-from django.utils.deprecation import RemovedInDjango20Warning
 from django.utils.translation import (
     LANGUAGE_SESSION_KEY, get_language, override,
 )
@@ -157,27 +155,6 @@ class I18NTests(TestCase):
             self.assertEqual(language_cookie['path'], '/test/')
             self.assertEqual(language_cookie['max-age'], 3600 * 7 * 2)
 
-    @ignore_warnings(category=RemovedInDjango20Warning)
-    def test_setlang_cookie_middleware_classes(self):
-        # we force saving language to a cookie rather than a session
-        # by excluding session middleware and those which do require it
-        test_settings = dict(
-            MIDDLEWARE=None,
-            MIDDLEWARE_CLASSES=['django.middleware.common.CommonMiddleware'],
-            LANGUAGE_COOKIE_NAME='mylanguage',
-            LANGUAGE_COOKIE_AGE=3600 * 7 * 2,
-            LANGUAGE_COOKIE_DOMAIN='.example.com',
-            LANGUAGE_COOKIE_PATH='/test/',
-        )
-        with self.settings(**test_settings):
-            post_data = dict(language='pl', next='/views/')
-            response = self.client.post('/i18n/setlang/', data=post_data)
-            language_cookie = response.cookies.get('mylanguage')
-            self.assertEqual(language_cookie.value, 'pl')
-            self.assertEqual(language_cookie['domain'], '.example.com')
-            self.assertEqual(language_cookie['path'], '/test/')
-            self.assertEqual(language_cookie['max-age'], 3600 * 7 * 2)
-
     def test_setlang_decodes_http_referer_url(self):
         """
         The set_language view decodes the HTTP_REFERER URL.
@@ -207,28 +184,6 @@ class I18NTests(TestCase):
         )
         self.assertRedirects(response, '/en/translated/')
 
-    @ignore_warnings(category=RemovedInDjango20Warning)
-    @override_settings(
-        MIDDLEWARE=None,
-        MIDDLEWARE_CLASSES=[
-            'django.contrib.sessions.middleware.SessionMiddleware',
-            'django.middleware.locale.LocaleMiddleware',
-        ],
-    )
-    def test_lang_from_translated_i18n_pattern_middleware_classes(self):
-        response = self.client.post(
-            '/i18n/setlang/', data={'language': 'nl'},
-            follow=True, HTTP_REFERER='/en/translated/'
-        )
-        self.assertEqual(self.client.session[LANGUAGE_SESSION_KEY], 'nl')
-        self.assertRedirects(response, '/nl/vertaald/')
-        # And reverse
-        response = self.client.post(
-            '/i18n/setlang/', data={'language': 'en'},
-            follow=True, HTTP_REFERER='/nl/vertaald/'
-        )
-        self.assertRedirects(response, '/en/translated/')
-
 
 @override_settings(ROOT_URLCONF='view_tests.urls')
 class JsI18NTests(SimpleTestCase):