summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-07-03 17:56:25 +0000
committerJannis Leidel <jannis@leidel.info>2011-07-03 17:56:25 +0000
commit43cb78fafde45fae9e057d29878c2ebf40aef873 (patch)
treeab7b764d09121298602e771ef739a44718595b1d /tests
parentc29e45491ea2e2a689299abda1b722ff814efd80 (diff)
Fixed #14506 -- Added an assertion to XViewMiddleware about the dependency on the authentication middleware. Thanks, vanschelven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/utils/decorators.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/regressiontests/utils/decorators.py b/tests/regressiontests/utils/decorators.py
index 837cc7d39e..96f4dd4e7a 100644
--- a/tests/regressiontests/utils/decorators.py
+++ b/tests/regressiontests/utils/decorators.py
@@ -1,24 +1,26 @@
from django.http import HttpResponse
-from django.middleware.doc import XViewMiddleware
from django.template import Template, Context
from django.template.response import TemplateResponse
from django.test import TestCase, RequestFactory
from django.utils.decorators import decorator_from_middleware
-xview_dec = decorator_from_middleware(XViewMiddleware)
+class ProcessViewMiddleware(object):
+ def process_view(self, request, view_func, view_args, view_kwargs):
+ pass
+process_view_dec = decorator_from_middleware(ProcessViewMiddleware)
-@xview_dec
-def xview(request):
+@process_view_dec
+def process_view(request):
return HttpResponse()
-class ClassXView(object):
+class ClassProcessView(object):
def __call__(self, request):
return HttpResponse()
-class_xview = xview_dec(ClassXView())
+class_process_view = process_view_dec(ClassProcessView())
class FullMiddleware(object):
@@ -52,13 +54,13 @@ class DecoratorFromMiddlewareTests(TestCase):
"""
Test a middleware that implements process_view.
"""
- xview(self.rf.get('/'))
+ process_view(self.rf.get('/'))
def test_callable_process_view_middleware(self):
"""
Test a middleware that implements process_view, operating on a callable class.
"""
- class_xview(self.rf.get('/'))
+ class_process_view(self.rf.get('/'))
def test_full_dec_normal(self):
"""