From c558a43fd6bbcea9972b66965f7e8619bc247df1 Mon Sep 17 00:00:00 2001 From: Ludwik Trammer Date: Sat, 23 Nov 2013 18:27:23 +0100 Subject: [1.6.x] Fixed #21473 -- Limited language preservation to logout Current language is no longer saved to session by LocaleMiddleware on every response (the behavior introduced in #14825). Instead language stored in session is reintroduced into new session after logout. --- tests/i18n/tests.py | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) (limited to 'tests') diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index 4be0fbf2ac..a0bbd4f7d7 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -1191,29 +1191,12 @@ class LocaleMiddlewareTests(TransRealMixin, TestCase): 'django.middleware.common.CommonMiddleware', ), ) - def test_session_language(self): - """ - Check that language is stored in session if missing. - """ - # Create an empty session - engine = import_module(settings.SESSION_ENGINE) - session = engine.SessionStore() - session.save() - self.client.cookies[settings.SESSION_COOKIE_NAME] = session.session_key - - # Clear the session data before request - session.save() - response = self.client.get('/en/simple/') - self.assertEqual(self.client.session['django_language'], 'en') - - # Clear the session data before request - session.save() - response = self.client.get('/fr/simple/') - self.assertEqual(self.client.session['django_language'], 'fr') - - # Check that language is not changed in session - response = self.client.get('/en/simple/') - self.assertEqual(self.client.session['django_language'], 'fr') + def test_language_not_saved_to_session(self): + """Checks that current language is not automatically saved to + session on every request.""" + # Regression test for #21473 + self.client.get('/fr/simple/') + self.assertNotIn('django_language', self.client.session) @override_settings( -- cgit v1.3