Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed auth context processor tests, which were not running at all pre…

…viously.

It seems they were accidentally disabled following being moved from
regressiontests in [15990]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 45317677008a71c261b8c00388e8c2555a96598c 1 parent 93e9d91
Luke Plant spookylukey authored
1  django/contrib/auth/tests/__init__.py
View
@@ -2,6 +2,7 @@
RowlevelBackendTest, AnonymousUserBackendTest, NoAnonymousUserBackendTest,
NoBackendsTest, InActiveUserBackendTest, NoInActiveUserBackendTest)
from django.contrib.auth.tests.basic import BasicTestCase
+from django.contrib.auth.tests.context_processors import AuthContextProcessorTests
from django.contrib.auth.tests.decorators import LoginRequiredTestCase
from django.contrib.auth.tests.forms import (UserCreationFormTest,
AuthenticationFormTest, SetPasswordFormTest, PasswordChangeFormTest,
19 django/contrib/auth/tests/context_processors.py
View
@@ -1,16 +1,27 @@
-# from django.conf import settings
+import os
+
+from django.conf import settings
from django.contrib.auth import authenticate
from django.db.models import Q
from django.test import TestCase
-# from django.template import Template
+
class AuthContextProcessorTests(TestCase):
"""
Tests for the ``django.contrib.auth.context_processors.auth`` processor
"""
- urls = 'regressiontests.context_processors.urls'
+ urls = 'django.contrib.auth.tests.urls'
fixtures = ['context-processors-users.xml']
+ def setUp(self):
+ self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS
+ settings.TEMPLATE_DIRS = (
+ os.path.join(os.path.dirname(__file__), 'templates'),
+ )
+
+ def tearDown(self):
+ settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
+
def test_session_not_accessed(self):
"""
Tests that the session is not accessed simply by including
@@ -74,4 +85,4 @@ def test_user_attrs(self):
# equality in a non-duck-typing way
# See bug #12060
self.assertEqual(response.context['user'], user)
- self.assertEqual(user, response.context['user'])
+ self.assertEqual(user, response.context['user'])
0  ...mplates/context_processors/auth_attrs_access.html → ...mplates/context_processors/auth_attrs_access.html
View
File renamed without changes
0  ...lates/context_processors/auth_attrs_messages.html → ...lates/context_processors/auth_attrs_messages.html
View
File renamed without changes
0  ...ates/context_processors/auth_attrs_no_access.html → ...ates/context_processors/auth_attrs_no_access.html
View
File renamed without changes
0  ...emplates/context_processors/auth_attrs_perms.html → ...emplates/context_processors/auth_attrs_perms.html
View
File renamed without changes
0  ...es/context_processors/auth_attrs_test_access.html → ...es/context_processors/auth_attrs_test_access.html
View
File renamed without changes
0  ...templates/context_processors/auth_attrs_user.html → ...templates/context_processors/auth_attrs_user.html
View
File renamed without changes
5 django/contrib/auth/tests/urls.py
View
@@ -1,8 +1,11 @@
from django.conf.urls.defaults import patterns, url
+from django.contrib.auth import context_processors
from django.contrib.auth.urls import urlpatterns
from django.contrib.auth.views import password_reset
from django.contrib.auth.decorators import login_required
+from django.contrib.messages.api import info
from django.http import HttpResponse
+from django.shortcuts import render_to_response
from django.template import Template, RequestContext
from django.views.decorators.cache import never_cache
@@ -35,7 +38,7 @@ def auth_processor_perms(request):
RequestContext(request, {}, processors=[context_processors.auth]))
def auth_processor_messages(request):
- request.user.message_set.create(message="Message 1")
+ info(request, "Message 1")
return render_to_response('context_processors/auth_attrs_messages.html',
RequestContext(request, {}, processors=[context_processors.auth]))
Please sign in to comment.
Something went wrong with that request. Please try again.