Skip to content

Commit

Permalink
Merge a9dd10f into 5d2c66d
Browse files Browse the repository at this point in the history
  • Loading branch information
goodtune committed Mar 1, 2016
2 parents 5d2c66d + a9dd10f commit b03eaf7
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 2 deletions.
2 changes: 2 additions & 0 deletions docs/methods.rst
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ django-test-plus provides the following response method checks for you::
- response_302()
- response_403()
- response_404()
- response_405()
- response_410()

All of which take an option Django test client response as their only argument.
If it's available, the response_XXX methods will use the last response. So you
Expand Down
5 changes: 5 additions & 0 deletions test_plus/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ def response_405(self, response=None):
response = self._which_response(response)
self.assertEqual(response.status_code, 405)

def response_410(self, response=None):
""" Given response has status_code 410 """
response = self._which_response(response)
self.assertEqual(response.status_code, 410)

def get_check_200(self, url, *args, **kwargs):
""" Test that we can GET a page and it returns a 200 """
response = self.get(url, *args, **kwargs)
Expand Down
7 changes: 7 additions & 0 deletions test_project/test_app/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,13 @@ def test_response_405(self):
# Test without response option
self.response_405()

def test_response_410(self):
res = self.get('view-410')
self.response_410(res)

# Test without response option
self.response_410()

def test_make_user(self):
""" Test make_user using django.contrib.auth defaults """
u1 = self.make_user('u1')
Expand Down
3 changes: 2 additions & 1 deletion test_project/test_app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from .views import (
data_1, data_5, needs_login, view_200, view_201, view_302,
view_403, view_404, view_405, view_context_with,
view_403, view_404, view_405, view_410, view_context_with,
view_context_without, view_is_ajax, view_redirect
)

Expand All @@ -18,6 +18,7 @@
url(r'^view/403/$', view_403, name='view-403'),
url(r'^view/404/$', view_404, name='view-404'),
url(r'^view/405/$', view_405, name='view-405'),
url(r'^view/410/$', view_410, name='view-410'),
url(r'^view/redirect/$', view_redirect, name='view-redirect'),
url(r'^view/needs-login/$', needs_login, name='view-needs-login'),
url(r'^view/data1/$', data_1, name='view-data-1'),
Expand Down
6 changes: 5 additions & 1 deletion test_project/test_app/views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
from django.http import HttpResponse, HttpResponseGone
from django.shortcuts import render, redirect
from django.views import generic

Expand Down Expand Up @@ -32,6 +32,10 @@ def view_405(request):
return HttpResponse('', status=405)


def view_410(request):
return HttpResponseGone()


def view_redirect(request):
return redirect('view-200')

Expand Down

0 comments on commit b03eaf7

Please sign in to comment.