aboutsummaryrefslogtreecommitdiffstats
path: root/tests/tests.py
diff options
context:
space:
mode:
authorDavid Cramer2011-08-21 17:56:19 -0700
committerDavid Cramer2011-08-21 17:56:19 -0700
commit695e8c06bfc756204e823d1b1792ca6c06e62439 (patch)
treedfd2e28a9c35b72352317dd93df6c48f7218ec50 /tests/tests.py
parent6e3d9da54cffb41461c6778c55b0461410a9655c (diff)
parent490df5e463bb9b7892809b8ec5629995062fa1c6 (diff)
downloaddjango-debug-toolbar-695e8c06bfc756204e823d1b1792ca6c06e62439.tar.bz2
Merge pull request #198 from jasonkeene/internal_ips_issue
Toolbar Displays to External IPs (Fixed Issue #186)
Diffstat (limited to 'tests/tests.py')
-rw-r--r--tests/tests.py20
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/tests.py b/tests/tests.py
index 80fda7d..6f7de0d 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -55,23 +55,25 @@ class DebugToolbarTestCase(BaseTestCase):
def test_show_toolbar_DEBUG(self):
request = self.request
+ request.META = {'REMOTE_ADDR': '127.0.0.1'}
middleware = DebugToolbarMiddleware()
- with Settings(DEBUG=True):
+ with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
self.assertTrue(middleware._show_toolbar(request))
- with Settings(DEBUG=False):
+ with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=False):
self.assertFalse(middleware._show_toolbar(request))
def test_show_toolbar_TEST(self):
request = self.request
+ request.META = {'REMOTE_ADDR': '127.0.0.1'}
middleware = DebugToolbarMiddleware()
- with Settings(TEST=True, DEBUG=True):
+ with Settings(INTERNAL_IPS=['127.0.0.1'], TEST=True, DEBUG=True):
self.assertFalse(middleware._show_toolbar(request))
- with Settings(TEST=False, DEBUG=True):
+ with Settings(INTERNAL_IPS=['127.0.0.1'], TEST=False, DEBUG=True):
self.assertTrue(middleware._show_toolbar(request))
def test_show_toolbar_INTERNAL_IPS(self):
@@ -80,10 +82,10 @@ class DebugToolbarTestCase(BaseTestCase):
request.META = {'REMOTE_ADDR': '127.0.0.1'}
middleware = DebugToolbarMiddleware()
- with Settings(INTERNAL_IPS=['127.0.0.1']):
+ with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
self.assertTrue(middleware._show_toolbar(request))
- with Settings(INTERNAL_IPS=[]):
+ with Settings(INTERNAL_IPS=[], DEBUG=True):
self.assertFalse(middleware._show_toolbar(request))
def test_request_urlconf_string(self):
@@ -93,7 +95,7 @@ class DebugToolbarTestCase(BaseTestCase):
request.META = {'REMOTE_ADDR': '127.0.0.1'}
middleware = DebugToolbarMiddleware()
- with Settings(DEBUG=True):
+ with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
middleware.process_request(request)
self.assertFalse(isinstance(request.urlconf, basestring))
@@ -109,7 +111,7 @@ class DebugToolbarTestCase(BaseTestCase):
request.META = {'REMOTE_ADDR': '127.0.0.1'}
middleware = DebugToolbarMiddleware()
- with Settings(DEBUG=True):
+ with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
middleware.process_request(request)
request.urlconf = 'debug_toolbar.urls'
middleware.process_request(request)
@@ -127,7 +129,7 @@ class DebugToolbarTestCase(BaseTestCase):
request.META = {'REMOTE_ADDR': '127.0.0.1'}
middleware = DebugToolbarMiddleware()
- with Settings(DEBUG=True):
+ with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
middleware.process_request(request)
self.assertFalse(isinstance(request.urlconf, basestring))