diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/panels/test_template.py | 22 | ||||
| -rw-r--r-- | tests/test_integration.py | 4 | ||||
| -rw-r--r-- | tests/urls.py | 1 | ||||
| -rw-r--r-- | tests/views.py | 5 |
4 files changed, 19 insertions, 13 deletions
diff --git a/tests/panels/test_template.py b/tests/panels/test_template.py index 4e30a73..c98521e 100644 --- a/tests/panels/test_template.py +++ b/tests/panels/test_template.py @@ -1,3 +1,5 @@ +# coding: utf-8 + from __future__ import unicode_literals import django @@ -8,13 +10,16 @@ from debug_toolbar.panels.template import TemplateDebugPanel from debug_toolbar.panels.sql import SQLDebugPanel from ..base import BaseTestCase +from ..models import NonAsciiRepr class TemplateDebugPanelTestCase(BaseTestCase): + def setUp(self): + super(TemplateDebugPanelTestCase, self).setUp() + self.panel = self.toolbar.get_panel(TemplateDebugPanel) + def test_queryset_hook(self): - template_panel = self.toolbar.get_panel(TemplateDebugPanel) - sql_panel = self.toolbar.get_panel(SQLDebugPanel) t = Template("No context variables here!") c = Context({ 'queryset': User.objects.all(), @@ -23,9 +28,20 @@ class TemplateDebugPanelTestCase(BaseTestCase): } }) t.render(c) + # ensure the query was NOT logged + sql_panel = self.toolbar.get_panel(SQLDebugPanel) self.assertEqual(len(sql_panel._queries), 0) + base_ctx_idx = 1 if django.VERSION[:2] >= (1, 5) else 0 - ctx = template_panel.templates[0]['context'][base_ctx_idx] + ctx = self.panel.templates[0]['context'][base_ctx_idx] self.assertIn('<<queryset of auth.User>>', ctx) self.assertIn('<<triggers database query>>', ctx) + + def test_object_with_non_ascii_repr_in_context(self): + self.panel.process_request(self.request) + t = Template("{{ object }}") + c = Context({'object': NonAsciiRepr()}) + t.render(c) + self.panel.process_response(self.request, self.response) + self.assertIn('nôt åscíì', self.panel.content()) diff --git a/tests/test_integration.py b/tests/test_integration.py index e661467..2a2d4da 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -145,10 +145,6 @@ class DebugToolbarIntegrationTestCase(TestCase): self.assertContains(response, 'o\\xf9') self.assertContains(response, 'l\\xc3\\xa0') - def test_object_with_non_ascii_repr_in_context(self): - response = self.client.get('/non_ascii_context/') - self.assertContains(response, 'nôt åscíì') - def test_object_with_non_ascii_repr_in_request_vars(self): response = self.client.get('/non_ascii_request/') self.assertContains(response, 'nôt åscíì') diff --git a/tests/urls.py b/tests/urls.py index 80a68d9..854f0ed 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -16,7 +16,6 @@ urlpatterns = patterns('tests.views', # noqa url(r'^resolving2/(?P<arg1>.+)/(?P<arg2>.+)/$', 'resolving_view'), url(r'^resolving3/(.+)/$', 'resolving_view', {'arg2': 'default'}), url(r'^regular/(?P<title>.*)/$', 'regular_view'), - url(r'^non_ascii_context/$', 'non_ascii_context'), url(r'^non_ascii_request/$', 'regular_view', {'title': NonAsciiRepr()}), url(r'^new_user/$', 'new_user'), url(r'^execute_sql/$', 'execute_sql'), diff --git a/tests/views.py b/tests/views.py index 01c4971..8bbc447 100644 --- a/tests/views.py +++ b/tests/views.py @@ -14,11 +14,6 @@ def execute_sql(request): list(User.objects.all()) return HttpResponse() - -def non_ascii_context(request): - return render(request, 'basic.html', {'title': NonAsciiRepr()}) - - def regular_view(request, title): return render(request, 'basic.html', {'title': title}) |