mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Improved on r17454 to ensure that collapse.js only gets minified when DEBUG is False.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Julien Phalip
2012-02-05 10:26:05 +00:00
parent a90aad3511
commit 0f6cf4aba1
6 changed files with 57 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
tests/regressiontests/modeladmin/tests.py
View File

@@ -494,63 +494,6 @@ class ModelAdminTests(TestCase):
list(ma.get_formsets(request))[0]().forms[0].fields.keys(),
['extra', 'transport', 'id', 'DELETE', 'main_band'])
def test_media_minified_only_if_debug_is_false(self):
"""
Ensure that, with ModelAdmin, the minified versions of the JS files are
only used when DEBUG is False.
Refs #17521.
"""
ma = ModelAdmin(Band, self.site)
ma.prepopulated_fields = ['something']
ma.actions = ['some action']
with override_settings(DEBUG=False):
media_js = str(ma.media['js'])
self.assertFalse('jquery.js' in media_js)
self.assertTrue('jquery.min.js' in media_js)
self.assertFalse('prepopulate.js' in media_js)
self.assertTrue('prepopulate.min.js' in media_js)
self.assertFalse('actions.js' in media_js)
self.assertTrue('actions.min.js' in media_js)
with override_settings(DEBUG=True):
media_js = str(ma.media['js'])
self.assertTrue('jquery.js' in media_js)
self.assertFalse('jquery.min.js' in media_js)
self.assertTrue('prepopulate.js' in media_js)
self.assertFalse('prepopulate.min.js' in media_js)
self.assertTrue('actions.js' in media_js)
self.assertFalse('actions.min.js' in media_js)
def test_inlines_media_minified_only_if_debug_is_false(self):
"""
Ensure that, with InlineModelAdmin, the minified versions of the JS
files are only used when DEBUG is False.
Refs #17521.
"""
class InlineBandAdmin(InlineModelAdmin):
model = Band
ma = InlineBandAdmin(Band, self.site)
ma.prepopulated_fields = ['something']
ma.actions = ['some action']
with override_settings(DEBUG=False):
media_js = str(ma.media['js'])
self.assertFalse('jquery.js' in media_js)
self.assertTrue('jquery.min.js' in media_js)
self.assertFalse('prepopulate.js' in media_js)
self.assertTrue('prepopulate.min.js' in media_js)
self.assertFalse('inlines.js' in media_js)
self.assertTrue('inlines.min.js' in media_js)
with override_settings(DEBUG=True):
media_js = str(ma.media['js'])
self.assertTrue('jquery.js' in media_js)
self.assertFalse('jquery.min.js' in media_js)
self.assertTrue('prepopulate.js' in media_js)
self.assertFalse('prepopulate.min.js' in media_js)
self.assertTrue('inlines.js' in media_js)
self.assertFalse('inlines.min.js' in media_js)
class ValidationTests(unittest.TestCase):
def test_validation_only_runs_in_debug(self):