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

Remove test using django-overextends to simplify codebase

Browse Source
This commit is contained in:
Mathieu Pillard
2015-12-24 12:51:45 +01:00
parent d999eaaa2f
commit 9aff77e842
6 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compressor/test_settings.py
View File

@@ -1,5 +1,4 @@
import os import os
import django
TEST_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'tests') TEST_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'tests')
@@ -24,11 +23,6 @@ INSTALLED_APPS = [
'sekizai', 'sekizai',
] ]
# currently, we can't use overextends and django 1.9 since that would
# require updating the templates settings to the new format.
if django.VERSION < (1, 9):
INSTALLED_APPS.append('overextends')
STATICFILES_FINDERS = [ STATICFILES_FINDERS = [
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder',

9
compressor/tests/test_offline.py
View File

@@ -7,7 +7,6 @@ from importlib import import_module
from mock import patch from mock import patch
import django
from django.core.management.base import CommandError from django.core.management.base import CommandError
from django.template import Template, Context from django.template import Template, Context
from django.test import TestCase from django.test import TestCase
@@ -615,11 +614,3 @@ class OfflineCompressComplexTestCase(OfflineTestCaseMixin, TestCase):
rendered_template = self._render_template(engine) rendered_template = self._render_template(engine)
result = (result[0], result[2]) result = (result[0], result[2])
self.assertEqual(rendered_template, ''.join(result) + '\n') self.assertEqual(rendered_template, ''.join(result) + '\n')
@unittest.skipIf(django.VERSION >= (1, 9), 'overextends does not yet support django 1.9')
class OfflineGenerationOverextendsTestCase(OfflineTestCaseMixin, TestCase):
templates_dir = "test_overextends"
expected_hash = "e993b2a53994"
# overextends not supported for Jinja2 yet.
engines = ("django",)

7
compressor/tests/test_templates/test_overextends/base.html
View File

@@ -1,7 +0,0 @@
{% load compress %}{% spaceless %}
{% compress js %}
<script type="text/javascript">
alert("test overextends");
</script>
{% endcompress %}
{% endspaceless %}

1
compressor/tests/test_templates/test_overextends/test_compressor_offline.html
View File

@@ -1 +0,0 @@
{% overextends "base.html" %}

1
requirements/tests.txt
View File

@@ -6,7 +6,6 @@ Jinja2==2.7.3
lxml==3.4.2 lxml==3.4.2
beautifulsoup4==4.4.0 beautifulsoup4==4.4.0
django-sekizai==0.9.0 django-sekizai==0.9.0
django-overextends==0.4.0
csscompressor==0.9.4 csscompressor==0.9.4
rcssmin==1.0.6 rcssmin==1.0.6
rjsmin==1.0.12 rjsmin==1.0.12

3
tox.ini
View File

@@ -8,7 +8,6 @@ two =
lxml==3.4.2 lxml==3.4.2
beautifulsoup4==4.4.0 beautifulsoup4==4.4.0
django-sekizai==0.9.0 django-sekizai==0.9.0
django-overextends==0.4.0
csscompressor==0.9.4 csscompressor==0.9.4
rcssmin==1.0.6 rcssmin==1.0.6
rjsmin==1.0.12 rjsmin==1.0.12
@@ -21,7 +20,6 @@ three =
lxml==3.4.2 lxml==3.4.2
beautifulsoup4==4.4.0 beautifulsoup4==4.4.0
django-sekizai==0.9.0 django-sekizai==0.9.0
django-overextends==0.4.0
csscompressor==0.9.4 csscompressor==0.9.4
rcssmin==1.0.6 rcssmin==1.0.6
rjsmin==1.0.12 rjsmin==1.0.12
@@ -34,7 +32,6 @@ three_two =
lxml==3.4.2 lxml==3.4.2
beautifulsoup4==4.4.0 beautifulsoup4==4.4.0
django-sekizai==0.9.0 django-sekizai==0.9.0
django-overextends==0.4.0
csscompressor==0.9.4 csscompressor==0.9.4
rcssmin==1.0.6 rcssmin==1.0.6
rjsmin==1.0.12 rjsmin==1.0.12