diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/settings.py | 10 | ||||
| -rw-r--r-- | tests/test_integration.py | 53 | ||||
| -rw-r--r-- | tests/urls.py | 3 |
3 files changed, 7 insertions, 59 deletions
diff --git a/tests/settings.py b/tests/settings.py index d21e9e4..a41b5a7 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -8,12 +8,12 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__)) SECRET_KEY = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890' -INTERNAL_IPS = ['127.0.0.1', '::1'] +INTERNAL_IPS = ['127.0.0.1'] # Application definition -INSTALLED_APPS = ( +INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -22,9 +22,9 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'debug_toolbar', 'tests', -) +] -MIDDLEWARE_CLASSES = ( +MIDDLEWARE_CLASSES = [ 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -32,7 +32,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', -) +] ROOT_URLCONF = 'tests.urls' diff --git a/tests/test_integration.py b/tests/test_integration.py index a80f50c..412b14b 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -6,7 +6,6 @@ from xml.etree import ElementTree as ET from django.test import TestCase, RequestFactory from django.test.utils import override_settings -from django.utils import six from debug_toolbar.middleware import DebugToolbarMiddleware, show_toolbar from debug_toolbar.panels.request_vars import RequestVarsDebugPanel @@ -34,58 +33,6 @@ class DebugToolbarTestCase(BaseTestCase): with self.settings(INTERNAL_IPS=[]): self.assertFalse(show_toolbar(self.request)) - def test_request_urlconf_string(self): - request = rf.get('/') - request.urlconf = 'tests.urls' - middleware = DebugToolbarMiddleware() - - middleware.process_request(request) - - self.assertFalse(isinstance(request.urlconf, six.string_types)) - - patterns = request.urlconf.urlpatterns - self.assertTrue(hasattr(patterns[1], '_callback_str')) - self.assertEqual(patterns[-1]._callback_str, 'tests.views.execute_sql') - - def test_request_urlconf_string_per_request(self): - request = rf.get('/') - request.urlconf = 'debug_toolbar.urls' - middleware = DebugToolbarMiddleware() - - middleware.process_request(request) - request.urlconf = 'tests.urls' - middleware.process_request(request) - - self.assertFalse(isinstance(request.urlconf, six.string_types)) - - patterns = request.urlconf.urlpatterns - self.assertTrue(hasattr(patterns[1], '_callback_str')) - self.assertEqual(patterns[-1]._callback_str, 'tests.views.execute_sql') - - def test_request_urlconf_module(self): - request = rf.get('/') - request.urlconf = __import__('tests.urls').urls - middleware = DebugToolbarMiddleware() - - middleware.process_request(request) - - self.assertFalse(isinstance(request.urlconf, six.string_types)) - - patterns = request.urlconf.urlpatterns - self.assertTrue(hasattr(patterns[1], '_callback_str')) - self.assertEqual(patterns[-1]._callback_str, 'tests.views.execute_sql') - - def test_tuple_urlconf(self): - request = rf.get('/') - urls = __import__('tests.urls').urls - urls.urlpatterns = tuple(urls.urlpatterns) - request.urlconf = urls - middleware = DebugToolbarMiddleware() - - middleware.process_request(request) - - self.assertFalse(isinstance(request.urlconf, six.string_types)) - def _resolve_stats(self, path): # takes stats from RequestVars panel self.request.path = path diff --git a/tests/urls.py b/tests/urls.py index 977084b..d4417a1 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals -from django.conf.urls import patterns, url +from django.conf.urls import include, patterns, url from django.contrib import admin from .models import NonAsciiRepr @@ -18,4 +18,5 @@ urlpatterns = patterns('tests.views', # noqa url(r'^non_ascii_request/$', 'regular_view', {'title': NonAsciiRepr()}), url(r'^new_user/$', 'new_user'), url(r'^execute_sql/$', 'execute_sql'), + url(r'^__debug__/', include('debug_toolbar.urls', namespace='djdt', app_name='djdt')), ) |