Merge pull request #685 from KFoxder/fix_css_html_tempalte

Fixed a bug in css.html not defaulting media attribute to 'all'.

Author: KFoxder

AUTHORS

@@ -67,6 +67,7 @@ or just made Pipeline more awesome.
  * Josh Braegger <[email protected]>
  * Joshua Kehn <[email protected]>
  * Julien Hartmann <[email protected]>
+ * Kevin Fox <[email protected]> (@KFoxder)
  * Kristian Glass <[email protected]>
  * Kyle MacFarlane <[email protected]>
  * Leonardo Orozco <[email protected]>

pipeline/templates/pipeline/css.html

@@ -1 +1 @@
-<link href="{{ url }}" rel="stylesheet" type="{{ type }}"{% if media %} media="{{ media }}"{% endif %}{% if title %} title="{{ title|default:"all" }}"{% endif %}{% if charset %} charset="{{ charset }}"{% endif %} />
+<link href="{{ url }}" rel="stylesheet" type="{{ type }}" media="{{ media|default:"all" }}"{% if title %} title="{{ title }}"{% endif %}{% if charset %} charset="{{ charset }}"{% endif %} />

tests/settings.py

@@ -70,6 +70,28 @@ def local_path(path):
                 'pipeline/css/urls.css'
             ),
             'output_filename': 'screen.css'
+        },
+        'screen_media': {
+            'source_filenames': (
+                'pipeline/css/first.css',
+                'pipeline/css/second.css',
+                'pipeline/css/urls.css'
+            ),
+            'output_filename': 'screen_media.css',
+            'extra_context': {
+                'media': 'screen and (min-width:500px)',
+            },
+        },
+        'screen_title': {
+            'source_filenames': (
+                'pipeline/css/first.css',
+                'pipeline/css/second.css',
+                'pipeline/css/urls.css'
+            ),
+            'output_filename': 'screen_title.css',
+            'extra_context': {
+                'title': 'Default Style',
+            },
         }
     },
     'JAVASCRIPT': {

tests/tests/test_template.py

@@ -56,11 +56,19 @@ def render_template(self, template):
 
     def test_compressed_empty(self):
         rendered = self.render_template(u"""{% load pipeline %}{% stylesheet "unknow" %}""")
-        self.assertEqual(u"", rendered)
+        self.assertEqual(u'', rendered)
 
     def test_compressed_css(self):
         rendered = self.render_template(u"""{% load pipeline %}{% stylesheet "screen" %}""")
-        self.assertEqual(u'<link href="/static/screen.css" rel="stylesheet" type="text/css" />', rendered)
+        self.assertEqual(u'<link href="/static/screen.css" rel="stylesheet" type="text/css" media="all" />', rendered)
+
+    def test_compressed_css_media(self):
+        rendered = self.render_template(u"""{% load pipeline %}{% stylesheet "screen_media" %}""")
+        self.assertEqual(u'<link href="/static/screen_media.css" rel="stylesheet" type="text/css" media="screen and (min-width:500px)" />', rendered)
+
+    def test_compressed_css_title(self):
+        rendered = self.render_template(u"""{% load pipeline %}{% stylesheet "screen_title" %}""")
+        self.assertEqual(u'<link href="/static/screen_title.css" rel="stylesheet" type="text/css" media="all" title="Default Style" />', rendered)
 
     def test_compressed_js(self):
         rendered = self.render_template(u"""{% load pipeline %}{% javascript "scripts" %}""")