diff options
| author | Tim Graham <timograham@gmail.com> | 2014-04-28 18:41:16 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-04-28 18:41:36 -0400 |
| commit | aabceadd7d7a61468b0dc7dc9d560a770abae0cf (patch) | |
| tree | bf8997b7ecdb1e2c72b8a8db1d90eb20be53fc56 /tests/test_client_regress | |
| parent | 26b03f25265227498a2559af807918fe2a1d246f (diff) | |
Revert "Fixed #15179 -- middlewares not applied for test client login()"
This reverts commit 4fdd51b73240bf9c8d9472fcc45df699f0714755.
See the ticket for concerns with this implementation; it will be revisited.
Diffstat (limited to 'tests/test_client_regress')
| -rw-r--r-- | tests/test_client_regress/tests.py | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/tests/test_client_regress/tests.py b/tests/test_client_regress/tests.py index da903dfcfd..a776d10f20 100644 --- a/tests/test_client_regress/tests.py +++ b/tests/test_client_regress/tests.py @@ -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) @@ -804,11 +803,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',), ROOT_URLCONF='test_client_regress.urls',) class LoginTests(TestCase): @@ -830,24 +824,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',), @@ -1348,32 +1324,12 @@ class UploadedFileEncodingTest(TestCase): @override_settings(ROOT_URLCONF='test_client_regress.urls',) class RequestHeadersTest(TestCase): - fixtures = ['testdata'] - def test_client_headers(self): "A test client can receive custom headers" response = self.client.get("/check_headers/", HTTP_X_ARG_CHECK='Testing 123') 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') |
