Add unit tests for compressor implementations

fdintino · fdintino · commit c17fd8261833 · 2016-02-22T18:06:26.000-05:00
diff --git a/tests/assets/compressors/closure.js b/tests/assets/compressors/closure.js
@@ -0,0 +1 @@
+(function(){(function(){window.concat=function(){console.log(arguments)}})();(function(){window.cat=function(){console.log("hello world")}})()}).call(this);
diff --git a/tests/assets/compressors/cssmin.css b/tests/assets/compressors/cssmin.css
@@ -0,0 +1 @@
+.concat{display:none}.concatenate{display:block}
diff --git a/tests/assets/compressors/csstidy.css b/tests/assets/compressors/csstidy.css
@@ -0,0 +1 @@
+.concat{display:none;}.concatenate{display:block;}
diff --git a/tests/assets/compressors/jsmin.js b/tests/assets/compressors/jsmin.js
diff --git a/tests/assets/compressors/slimit.js b/tests/assets/compressors/slimit.js
diff --git a/tests/assets/compressors/uglifyjs.js b/tests/assets/compressors/uglifyjs.js
@@ -0,0 +1 @@
+(function(){(function(){window.concat=function(){console.log(arguments)}})();(function(){window.cat=function(){console.log("hello world")}})()}).call(this);
diff --git a/tests/assets/compressors/yuglify.css b/tests/assets/compressors/yuglify.css
@@ -0,0 +1 @@
+.concat{display:none}.concatenate{display:block}
diff --git a/tests/assets/compressors/yuglify.js b/tests/assets/compressors/yuglify.js
@@ -0,0 +1 @@
+(function(){(function(){window.concat=function(){console.log(arguments)}})(),function(){window.cat=function(){console.log("hello world")}}()}).call(this);
diff --git a/tests/assets/compressors/yui.css b/tests/assets/compressors/yui.css
@@ -0,0 +1 @@
+.concat{display:none}.concatenate{display:block}
diff --git a/tests/assets/compressors/yui.js b/tests/assets/compressors/yui.js
diff --git a/tests/package.json b/tests/package.json
@@ -17,6 +17,11 @@
     "less": "^2.5.3",
     "livescript": "^1.4.0",
     "node-sass": "^3.4.2",
-    "stylus": "^0.53.0"
+    "stylus": "^0.53.0",
+    "cssmin": "^0.4.3",
+    "google-closure-compiler": "^20151216.2.0",
+    "uglify-js": "^2.6.1",
+    "yuglify": "^0.1.4",
+    "yuicompressor": "^2.4.8"
   }
 }
diff --git a/tests/settings.py b/tests/settings.py
@@ -1,3 +1,4 @@
+import glob
 import os
 import distutils.spawn
 
@@ -59,6 +60,8 @@ def local_path(path):
 
 PIPELINE = {
     'PIPELINE_ENABLED': True,
+    'JS_COMPRESSOR': None,
+    'CSS_COMPRESSOR': None,
     'STYLESHEETS': {
         'screen': {
             'source_filenames': (
@@ -122,7 +125,11 @@ def local_path(path):
 NODE_MODULES_PATH = local_path('node_modules')
 NODE_BIN_PATH = os.path.join(NODE_MODULES_PATH, '.bin')
 NODE_EXE_PATH = distutils.spawn.find_executable('node')
+JAVA_EXE_PATH = distutils.spawn.find_executable('java')
+CSSTIDY_EXE_PATH = distutils.spawn.find_executable('csstidy')
 HAS_NODE = os.path.exists(NODE_BIN_PATH) and NODE_EXE_PATH
+HAS_JAVA = bool(JAVA_EXE_PATH)
+HAS_CSSTIDY = bool(CSSTIDY_EXE_PATH)
 
 if HAS_NODE:
     def node_exe_path(command):
@@ -139,8 +146,24 @@ def node_exe_path(command):
         'STYLUS_BINARY': node_exe_path('stylus'),
         'LIVE_SCRIPT_BINARY': node_exe_path('lsc'),
         'LIVE_SCRIPT_ARGUMENTS': ['--no-header'],
+        'YUGLIFY_BINARY': node_exe_path('yuglify'),
+        'UGLIFYJS_BINARY': node_exe_path('uglifyjs'),
+        'CSSMIN_BINARY': node_exe_path('cssmin'),
     })
 
+if HAS_NODE and HAS_JAVA:
+    PIPELINE.update({
+        'CLOSURE_BINARY': [
+            JAVA_EXE_PATH, '-jar',
+            os.path.join(NODE_MODULES_PATH, 'google-closure-compiler', 'compiler.jar')],
+        'YUI_BINARY': [
+            JAVA_EXE_PATH, '-jar',
+            glob.glob(os.path.join(NODE_MODULES_PATH, 'yuicompressor', 'build', '*.jar'))[0]]
+    })
+
+if HAS_CSSTIDY:
+    PIPELINE.update({'CSSTIDY_BINARY': CSSTIDY_EXE_PATH})
+
 TEMPLATE_DIRS = (
     local_path('templates'),
 )
diff --git a/tests/tests/test_compressor.py b/tests/tests/test_compressor.py
@@ -11,18 +11,24 @@
 except ImportError:
     from unittest.mock import patch  # noqa
 
-from unittest import skipIf
+from unittest import skipIf, skipUnless
 
+from django.conf import settings
 from django.test import TestCase
+from django.test.client import RequestFactory
+from django.utils.encoding import smart_bytes
 
-from pipeline.compressors import Compressor, TEMPLATE_FUNC, \
-    SubProcessCompressor
+from pipeline.compressors import (
+    Compressor, TEMPLATE_FUNC, SubProcessCompressor)
 from pipeline.compressors.yuglify import YuglifyCompressor
 from pipeline.collector import default_collector
 
 from tests.utils import _, pipeline_settings
 
 
+@pipeline_settings(
+    CSS_COMPRESSOR='pipeline.compressors.yuglify.YuglifyCompressor',
+    JS_COMPRESSOR='pipeline.compressors.yuglify.YuglifyCompressor')
 class CompressorTest(TestCase):
     def setUp(self):
         self.maxDiff = None
@@ -186,3 +192,84 @@ def test_compressor_subprocess_unicode(self):
 
     def tearDown(self):
         default_collector.clear()
+
+
+class CompressorImplementationTest(TestCase):
+
+    maxDiff = None
+
+    def setUp(self):
+        self.compressor = Compressor()
+        default_collector.collect(RequestFactory().get('/'))
+
+    def tearDown(self):
+        default_collector.clear()
+
+    def _test_compressor(self, compressor_cls, compress_type, expected_file):
+        override_settings = {
+            ("%s_COMPRESSOR" % compress_type.upper()): compressor_cls,
+        }
+        with pipeline_settings(**override_settings):
+            if compress_type == 'js':
+                result = self.compressor.compress_js(
+                    [_('pipeline/js/first.js'), _('pipeline/js/second.js')])
+            else:
+                result = self.compressor.compress_css(
+                    [_('pipeline/css/first.css'), _('pipeline/css/second.css')],
+                    os.path.join('pipeline', 'css', os.path.basename(expected_file)))
+        with self.compressor.storage.open(expected_file) as f:
+            expected = f.read()
+        self.assertEqual(smart_bytes(result), expected)
+
+    def test_jsmin(self):
+        self._test_compressor('pipeline.compressors.jsmin.JSMinCompressor',
+            'js', 'pipeline/compressors/jsmin.js')
+
+    def test_slimit(self):
+        self._test_compressor('pipeline.compressors.slimit.SlimItCompressor',
+            'js', 'pipeline/compressors/slimit.js')
+
+    @skipUnless(settings.HAS_NODE, "requires node")
+    def test_uglifyjs(self):
+        self._test_compressor('pipeline.compressors.uglifyjs.UglifyJSCompressor',
+            'js', 'pipeline/compressors/uglifyjs.js')
+
+    @skipUnless(settings.HAS_NODE, "requires node")
+    def test_yuglify_js(self):
+        self._test_compressor('pipeline.compressors.yuglify.YuglifyCompressor',
+            'js', 'pipeline/compressors/yuglify.js')
+
+    @skipUnless(settings.HAS_NODE, "requires node")
+    def test_yuglify_css(self):
+        self._test_compressor('pipeline.compressors.yuglify.YuglifyCompressor',
+            'css', 'pipeline/compressors/yuglify.css')
+
+    @skipUnless(settings.HAS_NODE, "requires node")
+    def test_cssmin(self):
+        self._test_compressor('pipeline.compressors.cssmin.CSSMinCompressor',
+            'css', 'pipeline/compressors/cssmin.css')
+
+    @skipUnless(settings.HAS_NODE, "requires node")
+    @skipUnless(settings.HAS_JAVA, "requires java")
+    def test_closure(self):
+        self._test_compressor('pipeline.compressors.closure.ClosureCompressor',
+            'js', 'pipeline/compressors/closure.js')
+
+    @skipUnless(settings.HAS_NODE, "requires node")
+    @skipUnless(settings.HAS_JAVA, "requires java")
+    def test_yui_js(self):
+        self._test_compressor('pipeline.compressors.yui.YUICompressor',
+            'js', 'pipeline/compressors/yui.js')
+
+    @skipUnless(settings.HAS_NODE, "requires node")
+    @skipUnless(settings.HAS_JAVA, "requires java")
+    def test_yui_css(self):
+        self._test_compressor('pipeline.compressors.yui.YUICompressor',
+            'css', 'pipeline/compressors/yui.css')
+
+    @skipUnless(settings.HAS_CSSTIDY, "requires csstidy")
+    def test_csstidy(self):
+        self._test_compressor('pipeline.compressors.csstidy.CSSTidyCompressor',
+            'css', 'pipeline/compressors/csstidy.css')
+
+
diff --git a/tox.ini b/tox.ini
@@ -14,6 +14,9 @@ deps =
   django18: Django>=1.8,<1.9
   django19: Django>=1.9,<1.10
   jinja2
+  jsmin==2.2.0
+  ply==3.4
+  slimit==0.8.1
 setenv =
     DJANGO_SETTINGS_MODULE = tests.settings
     PYTHONPATH = {toxinidir}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+(function(){(function(){window.concat=function(){console.log(arguments)}})();(function(){window.cat=function(){console.log("hello world")}})()}).call(this);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+.concat{display:none}.concatenate{display:block}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+.concat{display:none;}.concatenate{display:block;}`