diff options
| -rw-r--r-- | tests/panels/test_sql.py | 18 | ||||
| -rw-r--r-- | tests/test_integration.py | 7 | ||||
| -rw-r--r-- | tests/urls.py | 1 |
3 files changed, 14 insertions, 12 deletions
diff --git a/tests/panels/test_sql.py b/tests/panels/test_sql.py index 10846f5..4acd10b 100644 --- a/tests/panels/test_sql.py +++ b/tests/panels/test_sql.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals from django.contrib.auth.models import User from django.db import connection from django.db.utils import DatabaseError +from django.utils import six from django.utils import unittest from debug_toolbar.panels.sql import SQLDebugPanel @@ -35,14 +36,23 @@ class SQLPanelTestCase(BaseTestCase): panel = self.toolbar.get_panel(SQLDebugPanel) self.assertEqual(len(panel._queries), 0) - # non-ASCII query - list(User.objects.extra(where=["username = 'café'"])) + # non-ASCII text query + list(User.objects.extra(where=["username = 'apéro'"])) self.assertEqual(len(panel._queries), 1) - # non-ASCII parameters - list(User.objects.filter(username='café')) + # non-ASCII text parameters + list(User.objects.filter(username='thé')) self.assertEqual(len(panel._queries), 2) + # non-ASCII bytes parameters + list(User.objects.filter(username='café'.encode('utf-8'))) + self.assertEqual(len(panel._queries), 3) + + panel.process_response(self.request, self.response) + + # ensure the panel renders correctly + self.assertIn('café', panel.content()) + @unittest.skipUnless(connection.vendor == 'postgresql', 'Test valid only on PostgreSQL') def test_erroneous_query(self): diff --git a/tests/test_integration.py b/tests/test_integration.py index 41206fc..875efbe 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -139,13 +139,6 @@ class DebugToolbarIntegrationTestCase(TestCase): self.assertContains(response, 'LÀTÍN') # template self.assertContains(response, 'djDebug') # toolbar - def test_non_ascii_bytes_in_db_params(self): - response = self.client.get('/non_ascii_bytes_in_db_params/') - if six.PY3: - self.assertContains(response, 'djàngó') - else: - self.assertContains(response, 'dj\\xe0ng\\xf3') - def test_non_ascii_session(self): response = self.client.get('/set_session/') if six.PY3: diff --git a/tests/urls.py b/tests/urls.py index 93e77c4..80a68d9 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -17,7 +17,6 @@ urlpatterns = patterns('tests.views', # noqa 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_bytes_in_db_params/$', 'new_user', {'username': 'djàngó'.encode('utf-8')}), url(r'^non_ascii_request/$', 'regular_view', {'title': NonAsciiRepr()}), url(r'^new_user/$', 'new_user'), url(r'^execute_sql/$', 'execute_sql'), |