From e75309b712537f3ee53005bf6330057c9640be21 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 9 Dec 2013 17:42:04 +0100 Subject: Another pass over the staticfiles panel. - adds some docstrings - adds some basic tests - adds the staticfiles panel to the default list of panels - fixed a pluralization bug in the template - refactored some things into own methods for easier testing --- tests/additional_static/base.css | 3 +++ tests/panels/test_staticfiles.py | 30 ++++++++++++++++++++++++++++++ tests/settings.py | 2 ++ tests/tests.py | 1 + 4 files changed, 36 insertions(+) create mode 100644 tests/additional_static/base.css create mode 100644 tests/panels/test_staticfiles.py (limited to 'tests') diff --git a/tests/additional_static/base.css b/tests/additional_static/base.css new file mode 100644 index 0000000..8d7d127 --- /dev/null +++ b/tests/additional_static/base.css @@ -0,0 +1,3 @@ +body { + color: green; +} \ No newline at end of file diff --git a/tests/panels/test_staticfiles.py b/tests/panels/test_staticfiles.py new file mode 100644 index 0000000..7f68205 --- /dev/null +++ b/tests/panels/test_staticfiles.py @@ -0,0 +1,30 @@ +# coding: utf-8 + +from __future__ import absolute_import, unicode_literals + +from django.conf import settings +from django.contrib.staticfiles.templatetags import staticfiles +from django.template import Context, RequestContext, Template + +from ..base import BaseTestCase + + +class StaticFilesPanelTestCase(BaseTestCase): + + def setUp(self): + super(StaticFilesPanelTestCase, self).setUp() + self.panel = self.toolbar.get_panel_by_id('StaticFilesPanel') + + def test_default_case(self): + self.panel.process_request(self.request) + self.panel.process_response(self.request, self.response) + self.assertIn('django.contrib.staticfiles.finders.' + 'AppDirectoriesFinder (87 files)', self.panel.content) + self.assertIn('django.contrib.staticfiles.finders.' + 'FileSystemFinder (1 file)', self.panel.content) + self.assertEqual(self.panel.num_used, 0) + self.assertEqual(self.panel.num_found, 88) + self.assertEqual(self.panel.get_staticfiles_apps(), + ['django.contrib.admin', 'debug_toolbar']) + self.assertEqual(self.panel.get_staticfiles_dirs(), + settings.STATICFILES_DIRS) diff --git a/tests/settings.py b/tests/settings.py index 24e0cd4..9ff9fb6 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -40,6 +40,8 @@ ROOT_URLCONF = 'tests.urls' STATIC_URL = '/static/' +STATICFILES_DIRS = [os.path.join(BASE_DIR, 'tests', 'additional_static')] + # Cache and database diff --git a/tests/tests.py b/tests/tests.py index 1818fe7..ca77f5b 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -8,6 +8,7 @@ if django.VERSION[:2] < (1, 6): # unittest-style discovery isn't available from .panels.test_redirects import * # noqa from .panels.test_request import * # noqa from .panels.test_sql import * # noqa + from .panels.test_staticfiles import * # noqa from .panels.test_template import * # noqa from .test_integration import * # noqa from .test_utils import * # noqa -- cgit v1.2.3 From 4e37f8bd430d30807c56372a372e570fe346c0fb Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 9 Dec 2013 17:46:41 +0100 Subject: Use django-discover-runner on older Djangos. --- tests/settings.py | 5 +++++ tests/tests.py | 14 -------------- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 tests/tests.py (limited to 'tests') diff --git a/tests/settings.py b/tests/settings.py index 9ff9fb6..68346ff 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -1,6 +1,8 @@ """Django settings for tests.""" import os +import django + BASE_DIR = os.path.dirname(os.path.dirname(__file__)) @@ -64,3 +66,6 @@ DEBUG_TOOLBAR_CONFIG = { # Django's test client sets wsgi.multiprocess to True inappropriately 'RENDER_PANELS': False, } + +if django.VERSION[:2] < (1, 6): + TEST_RUNNER = 'discover_runner.DiscoverRunner' diff --git a/tests/tests.py b/tests/tests.py deleted file mode 100644 index ca77f5b..0000000 --- a/tests/tests.py +++ /dev/null @@ -1,14 +0,0 @@ -import django - -if django.VERSION[:2] < (1, 6): # unittest-style discovery isn't available - from .commands.test_debugsqlshell import * # noqa - from .panels.test_cache import * # noqa - from .panels.test_logging import * # noqa - from .panels.test_profiling import * # noqa - from .panels.test_redirects import * # noqa - from .panels.test_request import * # noqa - from .panels.test_sql import * # noqa - from .panels.test_staticfiles import * # noqa - from .panels.test_template import * # noqa - from .test_integration import * # noqa - from .test_utils import * # noqa -- cgit v1.2.3 From f55a48addf5d737f3a4b449283bc53b1a0931bd9 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 9 Dec 2013 18:25:36 +0100 Subject: Made a test less Django version dependent. --- tests/panels/test_staticfiles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/panels/test_staticfiles.py b/tests/panels/test_staticfiles.py index 7f68205..6b3128a 100644 --- a/tests/panels/test_staticfiles.py +++ b/tests/panels/test_staticfiles.py @@ -19,7 +19,7 @@ class StaticFilesPanelTestCase(BaseTestCase): self.panel.process_request(self.request) self.panel.process_response(self.request, self.response) self.assertIn('django.contrib.staticfiles.finders.' - 'AppDirectoriesFinder (87 files)', self.panel.content) + 'AppDirectoriesFinder', self.panel.content) self.assertIn('django.contrib.staticfiles.finders.' 'FileSystemFinder (1 file)', self.panel.content) self.assertEqual(self.panel.num_used, 0) -- cgit v1.2.3 From e4fafb92377221201f9089aa972ac6c5504b45dd Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 9 Dec 2013 18:39:25 +0100 Subject: More test relaxing. --- tests/panels/test_staticfiles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/panels/test_staticfiles.py b/tests/panels/test_staticfiles.py index 6b3128a..cc4616a 100644 --- a/tests/panels/test_staticfiles.py +++ b/tests/panels/test_staticfiles.py @@ -23,7 +23,7 @@ class StaticFilesPanelTestCase(BaseTestCase): self.assertIn('django.contrib.staticfiles.finders.' 'FileSystemFinder (1 file)', self.panel.content) self.assertEqual(self.panel.num_used, 0) - self.assertEqual(self.panel.num_found, 88) + self.assertNotEqual(self.panel.num_found, 0) self.assertEqual(self.panel.get_staticfiles_apps(), ['django.contrib.admin', 'debug_toolbar']) self.assertEqual(self.panel.get_staticfiles_dirs(), -- cgit v1.2.3 From 810a2fbc5157f619eb3d74c73c882f059360506b Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 9 Dec 2013 18:58:15 +0100 Subject: Use collections.OrderedDict if available. --- tests/panels/test_staticfiles.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests') diff --git a/tests/panels/test_staticfiles.py b/tests/panels/test_staticfiles.py index cc4616a..70a7b96 100644 --- a/tests/panels/test_staticfiles.py +++ b/tests/panels/test_staticfiles.py @@ -3,8 +3,6 @@ from __future__ import absolute_import, unicode_literals from django.conf import settings -from django.contrib.staticfiles.templatetags import staticfiles -from django.template import Context, RequestContext, Template from ..base import BaseTestCase -- cgit v1.2.3