Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #7836 -- Modified strategy used by the test client to check for…

… session functionality so it is useful in environments where the DB-based session backend isn't being used. Thanks trevor for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 84c71148e37235396436fa4b03de137766a15c02 1 parent 050e119
@ramiro ramiro authored
View
4 django/test/client.py
@@ -356,7 +356,7 @@ def _session(self):
"""
Obtains the current session variables.
"""
- if 'django.contrib.sessions' in settings.INSTALLED_APPS:
+ if 'django.contrib.sessions.middleware.SessionMiddleware' in settings.MIDDLEWARE_CLASSES:
engine = import_module(settings.SESSION_ENGINE)
cookie = self.cookies.get(settings.SESSION_COOKIE_NAME, None)
if cookie:
@@ -504,7 +504,7 @@ def login(self, **credentials):
"""
user = authenticate(**credentials)
if user and user.is_active \
- and 'django.contrib.sessions' in settings.INSTALLED_APPS:
+ and 'django.contrib.sessions.middleware.SessionMiddleware' in settings.MIDDLEWARE_CLASSES:
engine = import_module(settings.SESSION_ENGINE)
# Create a fake request to store login details.
View
15 tests/regressiontests/test_client_regress/models.py
@@ -13,7 +13,7 @@
import django.template.context
from django.test import Client, TestCase
from django.test.client import encode_file, RequestFactory
-from django.test.utils import ContextList
+from django.test.utils import ContextList, override_settings
class AssertContainsTests(TestCase):
@@ -518,6 +518,19 @@ def test_login(self):
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context['user'].username, 'testclient')
+
+# Remove the 'session' contrib app from INSTALLED_APPS
+@override_settings(INSTALLED_APPS=tuple(filter(lambda a: a!='django.contrib.sessions', settings.INSTALLED_APPS)))
+class NoSessionsAppInstalled(SessionEngineTests):
+ """#7836 - Test client can exercise sessions even when 'django.contrib.sessions' isn't installed."""
+
+ def test_session(self):
+ # This request sets a session variable.
+ response = self.client.get('/test_client_regress/set_session/')
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(self.client.session['session_var'], 'YES')
+
+
class URLEscapingTests(TestCase):
def test_simple_argument_get(self):
"Get a view that has a simple string argument"
View
4 tests/regressiontests/test_client_regress/session.py
@@ -2,7 +2,7 @@
class SessionStore(SessionBase):
"""
- A simple cookie-based session storage implemenation.
+ A simple cookie-based session storage implementation.
The session key is actually the session data, pickled and encoded.
This means that saving the session will change the session key.
@@ -27,4 +27,4 @@ def load(self):
return self.decode(self.session_key)
except:
self.modified = True
- return {}
+ return {}
Please sign in to comment.
Something went wrong with that request. Please try again.