Author: lukeplant
Date: 2011-05-23 09:08:45 -0700 (Mon, 23 May 2011)
New Revision: 16272
Removed:
django/trunk/tests/regressiontests/utils/urls.py
django/trunk/tests/regressiontests/utils/views.py
Modified:
django/trunk/tests/regressiontests/utils/decorators.py
django/trunk/tests/urls.py
Log:
Changed utils/decorators.py tests to use RequestFactory
Modified: django/trunk/tests/regressiontests/utils/decorators.py
===================================================================
--- django/trunk/tests/regressiontests/utils/decorators.py 2011-05-23
16:08:36 UTC (rev 16271)
+++ django/trunk/tests/regressiontests/utils/decorators.py 2011-05-23
16:08:45 UTC (rev 16272)
@@ -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('/'))
Deleted: django/trunk/tests/regressiontests/utils/urls.py
===================================================================
--- django/trunk/tests/regressiontests/utils/urls.py 2011-05-23 16:08:36 UTC
(rev 16271)
+++ django/trunk/tests/regressiontests/utils/urls.py 2011-05-23 16:08:45 UTC
(rev 16272)
@@ -1,8 +0,0 @@
-from django.conf.urls.defaults import *
-
-import views
-
-urlpatterns = patterns('',
- (r'^xview/$', views.xview),
- (r'^class_xview/$', views.class_xview),
-)
Deleted: django/trunk/tests/regressiontests/utils/views.py
===================================================================
--- django/trunk/tests/regressiontests/utils/views.py 2011-05-23 16:08:36 UTC
(rev 16271)
+++ django/trunk/tests/regressiontests/utils/views.py 2011-05-23 16:08:45 UTC
(rev 16272)
@@ -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())
Modified: django/trunk/tests/urls.py
===================================================================
--- django/trunk/tests/urls.py 2011-05-23 16:08:36 UTC (rev 16271)
+++ django/trunk/tests/urls.py 2011-05-23 16:08:45 UTC (rev 16272)
@@ -29,5 +29,4 @@
# admin widget tests
(r'widget_admin/', include('regressiontests.admin_widgets.urls')),
- (r'^utils/', include('regressiontests.utils.urls')),
)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
