Skip to content

Commit

Permalink
Fix test_view param to process_view in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
davepeck committed Feb 5, 2015
1 parent fe0c602 commit 8281d0d
Showing 1 changed file with 11 additions and 16 deletions.
27 changes: 11 additions & 16 deletions debreach/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class TestCSRFCryptMiddleware(TestCase):
def test_not_encoded(self):
request = RequestFactory().post('/', {'csrfmiddlewaretoken': 'abc123'})
middleware = CSRFCryptMiddleware()
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})
self.assertEqual(request.POST.get('csrfmiddlewaretoken'), 'abc123')

def test_encoded(self):
Expand All @@ -43,7 +43,7 @@ def test_encoded(self):
{'csrfmiddlewaretoken': 'aBcDeF$ACAAdVd1'}
)
middleware = CSRFCryptMiddleware()
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})
self.assertEqual(request.POST.get('csrfmiddlewaretoken'), 'abc123')

def test_mutable_status(self):
Expand All @@ -53,55 +53,50 @@ def test_mutable_status(self):
)
request.POST._mutable = False
middleware = CSRFCryptMiddleware()
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})
self.assertFalse(request.POST._mutable)
request = RequestFactory().post(
'/',
{'csrfmiddlewaretoken': 'aBcDeF$ACAAdVd1'}
)
request.POST._mutable = True
middleware = CSRFCryptMiddleware()
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})
self.assertTrue(request.POST._mutable)

def test_header_not_encoded(self):
request = RequestFactory().post('/', HTTP_X_CSRFTOKEN='abc123')
middleware = CSRFCryptMiddleware()
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})
self.assertEqual(request.META.get('HTTP_X_CSRFTOKEN'), 'abc123')

def test_header_encoded(self):
request = RequestFactory().post(
'/', HTTP_X_CSRFTOKEN='aBcDeF$ACAAdVd1',
)
middleware = CSRFCryptMiddleware()
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})
self.assertEqual(request.META.get('HTTP_X_CSRFTOKEN'), 'abc123')

def test_tampering(self):
request = RequestFactory().post(
'/', {'csrfmiddlewaretoken': '123456$abc'})
middleware = CSRFCryptMiddleware()
with self.assertRaises(SuspiciousOperation):
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})

def test_header_tampering(self):
request = RequestFactory().post('/', HTTP_X_CSRFTOKEN='123456$abc')
middleware = CSRFCryptMiddleware()
with self.assertRaises(SuspiciousOperation):
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})

def test_csrf_exempt(self):
# This is an odd test. We're testing that, when a view is csrf_exempt,
# process_view will bail without performing any processing.
request = RequestFactory().post('/', HTTP_X_CSRFTOKEN="aB$AHM")
middleware = CSRFCryptMiddleware()
middleware.process_view(
request,
csrf_exempt(test_view(request)),
(),
{}
)
middleware.process_view(request, csrf_exempt(test_view), (), {})
self.assertEqual("aB$AHM", request.META['HTTP_X_CSRFTOKEN'])


Expand Down Expand Up @@ -278,7 +273,7 @@ def test_round_trip_loop(self):
request = RequestFactory().post(
'/', {'csrfmiddlewaretoken': token})
middleware = CSRFCryptMiddleware()
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})
self.assertEqual(
force_text(request.POST.get('csrfmiddlewaretoken')),
force_text(csrf_token)
Expand All @@ -299,7 +294,7 @@ def test_round_trip_loop_header(self):
HTTP_X_REQUESTED_WITH='XMLHttpRequest'
)
middleware = CSRFCryptMiddleware()
middleware.process_view(request, test_view(request), (), {})
middleware.process_view(request, test_view, (), {})
self.assertEqual(
force_text(request.META.get('HTTP_X_CSRFTOKEN')),
force_text(csrf_token)
Expand Down

0 comments on commit 8281d0d

Please sign in to comment.