openstack/deb-python-django-compressor
Code Issues Proposed changes

Added tests and changelog entry for previous commit. Fixes #138.

Browse Source
This commit is contained in:
Jannis Leidel
2011-11-24 15:26:43 +01:00
parent 66982ff6a1
commit 8286c230e1
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.txt
View File

@@ -42,6 +42,9 @@ v1.2.0
signal to be either :class:`compressor.css.CssCompressor` or
:class:`compressor.js.JsCompressor` for easier customization.
- Correctly handle offline compressing files that are found in ``{% if %}``
template blocks.
v1.1.1
------

7
tests/templates/test_compressor_offline.html
View File

@@ -21,6 +21,13 @@
alert("test 2");
</script>
{% endcompress %}
{% if condition %}
{% compress js%}
<script type="text/javascript">alert("{{ condition|default:"yellow" }}");</script>
{% endcompress %}
{% endif %}
{% endspaceless %}{% endblock %}
{% block js %}{% spaceless %}

11
tests/tests/offline.py
View File

@@ -40,30 +40,29 @@ class OfflineGenerationTestCase(TestCase):
def test_offline(self):
count, result = CompressCommand().compress()
self.assertEqual(5, count)
self.assertEqual(6, count)
self.assertEqual([
css_tag('/media/CACHE/css/cd579b7deb7d.css'),
u'<script type="text/javascript" src="/media/CACHE/js/0a2bb9a287c0.js"></script>',
u'<script type="text/javascript" src="/media/CACHE/js/fb1736ad48b7.js"></script>',
u'<script type="text/javascript" src="/media/CACHE/js/1a63aacfe9de.js"></script>',
u'<script type="text/javascript" src="/media/CACHE/js/770a7311729e.js"></script>',
u'<link rel="stylesheet" href="/media/CACHE/css/67ed6aff7f7b.css" type="text/css" />',
], result)
# Template rendering should use the cache. FIXME: how to make sure of it ? Should we test the cache
# key<->values ourselves?
rendered_template = self.template.render(Context({})).replace("\n", "")
self.assertEqual(rendered_template, "".join(result).replace("\n", ""))
def test_offline_with_context(self):
self._old_offline_context = settings.COMPRESS_OFFLINE_CONTEXT
settings.COMPRESS_OFFLINE_CONTEXT = {
'color': 'blue',
'condition': 'red',
}
count, result = CompressCommand().compress()
self.assertEqual(5, count)
self.assertEqual(6, count)
self.assertEqual([
css_tag('/media/CACHE/css/ee62fbfd116a.css'),
u'<script type="text/javascript" src="/media/CACHE/js/0a2bb9a287c0.js"></script>',
u'<script type="text/javascript" src="/media/CACHE/js/fb1736ad48b7.js"></script>',
u'<script type="text/javascript" src="/media/CACHE/js/4e3758d50224.js"></script>',
u'<script type="text/javascript" src="/media/CACHE/js/770a7311729e.js"></script>',
u'<link rel="stylesheet" href="/media/CACHE/css/73e015f740c6.css" type="text/css" />',
], result)