Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.3.X] Changed utils/decorators.py tests to use RequestFactory

Backport of [16272] from trunk. Backported to make the backport of a
bugfix (regression) easier.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit afa092853fb0fde4abc172f7867121074f260618 1 parent 18ecfad
@spookylukey spookylukey authored
View
26 tests/regressiontests/utils/decorators.py
@@ -1,19 +1,39 @@
-from django.test import TestCase
+from django.http import HttpResponse
+from django.middleware.doc import XViewMiddleware
+from django.test import TestCase, RequestFactory
+from django.utils.decorators import decorator_from_middleware
+
+
+xview_dec = decorator_from_middleware(XViewMiddleware)
+
+
+@xview_dec
+def xview(request):
+ return HttpResponse()
+
+
+class ClassXView(object):
+ def __call__(self, request):
+ return HttpResponse()
+
+class_xview = xview_dec(ClassXView())
+
class DecoratorFromMiddlewareTests(TestCase):
"""
Tests for view decorators created using
``django.utils.decorators.decorator_from_middleware``.
"""
+ rf = RequestFactory()
def test_process_view_middleware(self):
"""
Test a middleware that implements process_view.
"""
- self.client.get('/utils/xview/')
+ xview(self.rf.get('/'))
def test_callable_process_view_middleware(self):
"""
Test a middleware that implements process_view, operating on a callable class.
"""
- self.client.get('/utils/class_xview/')
+ class_xview(self.rf.get('/'))
View
8 tests/regressiontests/utils/urls.py
@@ -1,8 +0,0 @@
-from django.conf.urls.defaults import *
-
-import views
-
-urlpatterns = patterns('',
- (r'^xview/$', views.xview),
- (r'^class_xview/$', views.class_xview),
-)
View
17 tests/regressiontests/utils/views.py
@@ -1,17 +0,0 @@
-from django.http import HttpResponse
-from django.utils.decorators import decorator_from_middleware
-from django.middleware.doc import XViewMiddleware
-
-
-xview_dec = decorator_from_middleware(XViewMiddleware)
-
-def xview(request):
- return HttpResponse()
-xview = xview_dec(xview)
-
-
-class ClassXView(object):
- def __call__(self, request):
- return HttpResponse()
-
-class_xview = xview_dec(ClassXView())
View
2  tests/urls.py
@@ -29,8 +29,6 @@
# admin widget tests
(r'widget_admin/', include('regressiontests.admin_widgets.urls')),
- (r'^utils/', include('regressiontests.utils.urls')),
-
# test urlconf for syndication tests
(r'^syndication/', include('regressiontests.syndication.urls')),
Please sign in to comment.
Something went wrong with that request. Please try again.