mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 01:25:58 +00:00
Code Issues 25 Releases Wiki Activity

Reverted r16386 because it replaced a brittle method with another not less

Browse Source 
arbitrary method when the test client checks for the presence of the bundled
session backends+session middleware combination.

We will revisit the issue soon, probably to make these checks even less strict.

Refs #7836, #16605

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2012-03-15 02:46:07 +00:00
parent a673ec80e2
commit a935e83443
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/test/client.py
View File

@ -350,7 +350,7 @@ class Client(RequestFactory):
"""
Obtains the current session variables.
"""
if 'django.contrib.sessions.middleware.SessionMiddleware' in settings.MIDDLEWARE_CLASSES:
if 'django.contrib.sessions' in settings.INSTALLED_APPS:
engine = import_module(settings.SESSION_ENGINE)
cookie = self.cookies.get(settings.SESSION_COOKIE_NAME, None)
if cookie:
@ -498,7 +498,7 @@ class Client(RequestFactory):
"""
user = authenticate(**credentials)
if user and user.is_active \
and 'django.contrib.sessions.middleware.SessionMiddleware' in settings.MIDDLEWARE_CLASSES:
and 'django.contrib.sessions' in settings.INSTALLED_APPS:
engine = import_module(settings.SESSION_ENGINE)
# Create a fake request to store login details.

14
tests/regressiontests/test_client_regress/models.py
View File

@ -13,7 +13,7 @@ from django.template import (TemplateDoesNotExist, TemplateSyntaxError,
import django.template.context
from django.test import Client, TestCase
from django.test.client import encode_file, RequestFactory
from django.test.utils import ContextList, override_settings
from django.test.utils import ContextList
from django.template.response import SimpleTemplateResponse
from django.http import HttpResponse
@ -564,18 +564,6 @@ class SessionEngineTests(TestCase):
self.assertEqual(response.context['user'].username, 'testclient')
class NoSessionsAppInstalled(SessionEngineTests):
"""#7836 - Test client can exercise sessions even when 'django.contrib.sessions' isn't installed."""
# Remove the 'session' contrib app from INSTALLED_APPS
@override_settings(INSTALLED_APPS=tuple(filter(lambda a: a!='django.contrib.sessions', settings.INSTALLED_APPS)))
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"