Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improved error reporting for assertions where there are no form error…
…s, or a non-existent field has been provided. Also created a test client regression test, to hold the tests validating the failure cases of the TestCase assertions. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
- Loading branch information
1 parent
c7db4be
commit 7090290
Showing
8 changed files
with
152 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
""" | ||
Regression tests for the Test Client, especially the customized assertions. | ||
""" | ||
from django.test import Client, TestCase | ||
from django.core import mail | ||
|
||
class AssertTemplateUsedTests(TestCase): | ||
fixtures = ['testdata.json'] | ||
|
||
def test_no_context(self): | ||
"Template usage assertions work then templates aren't in use" | ||
response = self.client.get('/test_client_regress/no_template_view/') | ||
|
||
# Check that the no template case doesn't mess with the template assertions | ||
self.assertTemplateNotUsed(response, 'GET Template') | ||
|
||
try: | ||
self.assertTemplateUsed(response, 'GET Template') | ||
except AssertionError, e: | ||
self.assertEquals(str(e), "No templates used to render the response") | ||
|
||
def test_single_context(self): | ||
"Template assertions work when there is a single context" | ||
response = self.client.get('/test_client/post_view/', {}) | ||
|
||
# | ||
try: | ||
self.assertTemplateNotUsed(response, 'Empty GET Template') | ||
except AssertionError, e: | ||
self.assertEquals(str(e), "Template 'Empty GET Template' was used unexpectedly in rendering the response") | ||
|
||
try: | ||
self.assertTemplateUsed(response, 'Empty POST Template') | ||
except AssertionError, e: | ||
self.assertEquals(str(e), "Template 'Empty POST Template' was not used to render the response. Actual template was 'Empty GET Template'") | ||
|
||
def test_multiple_context(self): | ||
"Template assertions work when there are multiple contexts" | ||
post_data = { | ||
'text': 'Hello World', | ||
'email': 'foo@example.com', | ||
'value': 37, | ||
'single': 'b', | ||
'multi': ('b','c','e') | ||
} | ||
response = self.client.post('/test_client/form_view_with_template/', post_data) | ||
self.assertContains(response, 'POST data OK') | ||
try: | ||
self.assertTemplateNotUsed(response, "form_view.html") | ||
except AssertionError, e: | ||
self.assertEquals(str(e), "Template 'form_view.html' was used unexpectedly in rendering the response") | ||
|
||
try: | ||
self.assertTemplateNotUsed(response, 'base.html') | ||
except AssertionError, e: | ||
self.assertEquals(str(e), "Template 'base.html' was used unexpectedly in rendering the response") | ||
|
||
try: | ||
self.assertTemplateUsed(response, "Valid POST Template") | ||
except AssertionError, e: | ||
self.assertEquals(str(e), "Template 'Valid POST Template' was not one of the templates used to render the response. Templates used: ['form_view.html', 'base.html']") | ||
|
||
class AssertFormErrorTests(TestCase): | ||
def test_unknown_form(self): | ||
"An assertion is raised if the form name is unknown" | ||
post_data = { | ||
'text': 'Hello World', | ||
'email': 'not an email address', | ||
'value': 37, | ||
'single': 'b', | ||
'multi': ('b','c','e') | ||
} | ||
response = self.client.post('/test_client/form_view/', post_data) | ||
self.assertEqual(response.status_code, 200) | ||
self.assertTemplateUsed(response, "Invalid POST Template") | ||
|
||
try: | ||
self.assertFormError(response, 'wrong_form', 'some_field', 'Some error.') | ||
except AssertionError, e: | ||
self.assertEqual(str(e), "The form 'wrong_form' was not used to render the response") | ||
|
||
def test_unknown_field(self): | ||
"An assertion is raised if the field name is unknown" | ||
post_data = { | ||
'text': 'Hello World', | ||
'email': 'not an email address', | ||
'value': 37, | ||
'single': 'b', | ||
'multi': ('b','c','e') | ||
} | ||
response = self.client.post('/test_client/form_view/', post_data) | ||
self.assertEqual(response.status_code, 200) | ||
self.assertTemplateUsed(response, "Invalid POST Template") | ||
|
||
try: | ||
self.assertFormError(response, 'form', 'some_field', 'Some error.') | ||
except AssertionError, e: | ||
self.assertEqual(str(e), "The form 'form' in context 0 does not contain the field 'some_field'") | ||
|
||
def test_noerror_field(self): | ||
"An assertion is raised if the field doesn't have any errors" | ||
post_data = { | ||
'text': 'Hello World', | ||
'email': 'not an email address', | ||
'value': 37, | ||
'single': 'b', | ||
'multi': ('b','c','e') | ||
} | ||
response = self.client.post('/test_client/form_view/', post_data) | ||
self.assertEqual(response.status_code, 200) | ||
self.assertTemplateUsed(response, "Invalid POST Template") | ||
|
||
try: | ||
self.assertFormError(response, 'form', 'value', 'Some error.') | ||
except AssertionError, e: | ||
self.assertEqual(str(e), "The field 'value' on form 'form' in context 0 contains no errors") | ||
|
||
def test_unknown_error(self): | ||
"An assertion is raised if the field doesn't contain the provided error" | ||
post_data = { | ||
'text': 'Hello World', | ||
'email': 'not an email address', | ||
'value': 37, | ||
'single': 'b', | ||
'multi': ('b','c','e') | ||
} | ||
response = self.client.post('/test_client/form_view/', post_data) | ||
self.assertEqual(response.status_code, 200) | ||
self.assertTemplateUsed(response, "Invalid POST Template") | ||
|
||
try: | ||
self.assertFormError(response, 'form', 'email', 'Some error.') | ||
except AssertionError, e: | ||
self.assertEqual(str(e), "The field 'email' on form 'form' in context 0 does not contain the error 'Some error.' (actual errors: [u'Enter a valid e-mail address.'])") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
from django.conf.urls.defaults import * | ||
from django.views.generic.simple import redirect_to | ||
import views | ||
|
||
urlpatterns = patterns('', | ||
(r'^no_template_view/$', views.no_template_view), | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
from django.core.mail import EmailMessage, SMTPConnection | ||
from django.http import HttpResponse | ||
from django.shortcuts import render_to_response | ||
|
||
def no_template_view(request): | ||
"A simple view that expects a GET request, and returns a rendered template" | ||
return HttpResponse("No template used") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters