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:49:24 -0400 |
| commit | 1d20693fa67f314de08e51af57af6fb5460b7b0c (patch) | |
| tree | 2eae7de75eca4e7fe78c8d0859c24d9dbcc470a9 /tests | |
| parent | edca57817fa5c366483194020967cd9d4ef1318c (diff) | |
[1.7.x] 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.
Backport of aabceadd7d from master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_client_regress/tests.py | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/tests/test_client_regress/tests.py b/tests/test_client_regress/tests.py index d25d36b09f..996f70b667 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) @@ -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') |
