Skip to content

Commit

Permalink
[1.3.X] Changed utils/decorators.py tests to use RequestFactory
Browse files Browse the repository at this point in the history
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
spookylukey committed May 25, 2011
1 parent 18ecfad commit afa0928
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 30 deletions.
26 changes: 23 additions & 3 deletions 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('/'))
8 changes: 0 additions & 8 deletions tests/regressiontests/utils/urls.py

This file was deleted.

17 changes: 0 additions & 17 deletions tests/regressiontests/utils/views.py

This file was deleted.

2 changes: 0 additions & 2 deletions tests/urls.py
Expand Up @@ -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')),

Expand Down

0 comments on commit afa0928

Please sign in to comment.