mirror of
https://github.com/django/django.git
synced 2025-10-25 14:46:09 +00:00
[1.7.x] Revert "Fixed #15179 -- middlewares not applied for test client login()"
This reverts commit4fdd51b732. See the ticket for concerns with this implementation; it will be revisited. Backport ofaabceadd7dfrom master
This commit is contained in:
@@ -7,7 +7,6 @@ from __future__ import unicode_literals
|
||||
import os
|
||||
import itertools
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse, NoReverseMatch
|
||||
from django.template import (TemplateSyntaxError,
|
||||
Context, Template, loader)
|
||||
@@ -770,11 +769,6 @@ class AssertFormsetErrorTests(TestCase):
|
||||
**kwargs)
|
||||
|
||||
|
||||
class ProcessedMiddleware(object):
|
||||
def process_request(self, request):
|
||||
request.has_been_processed = True
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class LoginTests(TestCase):
|
||||
urls = 'test_client_regress.urls'
|
||||
@@ -796,24 +790,6 @@ class LoginTests(TestCase):
|
||||
# default client.
|
||||
self.assertRedirects(response, "http://testserver/get_view/")
|
||||
|
||||
@override_settings(
|
||||
MIDDLEWARE_CLASSES=list(settings.MIDDLEWARE_CLASSES) +
|
||||
['test_client_regress.tests.ProcessedMiddleware'])
|
||||
def test_request_middleware(self):
|
||||
"Check that the request middleware is executed on login request"
|
||||
|
||||
def listener(sender, signal, **kwargs):
|
||||
request = kwargs['request']
|
||||
self.assertTrue(hasattr(request, 'has_been_processed'))
|
||||
|
||||
# Unlike other Client request performing methods, login and logout don't
|
||||
# return the response, therefore we must use signals to get it
|
||||
user_logged_in.connect(listener)
|
||||
try:
|
||||
self.client.login(username='testclient', password='password')
|
||||
finally:
|
||||
user_logged_in.disconnect(listener)
|
||||
|
||||
|
||||
@override_settings(
|
||||
PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),
|
||||
@@ -1314,7 +1290,6 @@ class UploadedFileEncodingTest(TestCase):
|
||||
|
||||
class RequestHeadersTest(TestCase):
|
||||
urls = 'test_client_regress.urls'
|
||||
fixtures = ['testdata']
|
||||
|
||||
def test_client_headers(self):
|
||||
"A test client can receive custom headers"
|
||||
@@ -1322,24 +1297,6 @@ class RequestHeadersTest(TestCase):
|
||||
self.assertEqual(response.content, b"HTTP_X_ARG_CHECK: Testing 123")
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
def test_client_login_headers(self):
|
||||
"Test client headers are used in login"
|
||||
|
||||
client = Client(HTTP_HOST='different')
|
||||
|
||||
def listener(sender, signal, **kwargs):
|
||||
request = kwargs['request']
|
||||
self.assertEqual(request.get_host(), 'different')
|
||||
|
||||
# Unlike other Client request performing methods, login and logout don't
|
||||
# return the response, therefore we must use signals to get it
|
||||
user_logged_in.connect(listener)
|
||||
try:
|
||||
client.login(username='testclient', password='password')
|
||||
finally:
|
||||
user_logged_in.disconnect(listener)
|
||||
|
||||
def test_client_headers_redirect(self):
|
||||
"Test client headers are preserved through redirects"
|
||||
response = self.client.get("/check_headers_redirect/", follow=True, HTTP_X_ARG_CHECK='Testing 123')
|
||||
|
||||
Reference in New Issue
Block a user