|
2 | 2 |
|
3 | 3 | from django.forms import Media
|
4 | 4 | from django.test import TestCase
|
5 |
| -from django.utils import six |
6 | 5 |
|
7 | 6 | from pipeline.forms import PipelineFormMedia
|
8 | 7 | from ..utils import pipeline_settings
|
@@ -76,21 +75,23 @@ class MyMedia(PipelineFormMedia):
|
76 | 75 | 'print': ['/static/print.min.css'],
|
77 | 76 | })
|
78 | 77 | self.assertEqual(MyMedia.css, media._css)
|
79 |
| - self.assertEqual( |
80 |
| - list(media.render_css()), |
81 |
| - [ |
82 |
| - '<link href="%s" type="text/css" media="all" ' |
83 |
| - 'rel="stylesheet" />' % path |
84 |
| - for path in ( |
85 |
| - '/static/extra1.css', |
86 |
| - '/static/extra2.css', |
87 |
| - '/static/styles1.min.css', |
88 |
| - '/static/styles2.min.css', |
89 |
| - ) |
90 |
| - ] + [ |
91 |
| - '<link href="/static/print.min.css" type="text/css" ' |
92 |
| - 'media="print" rel="stylesheet" />' |
93 |
| - ]) |
| 78 | + expected_regex = [ |
| 79 | + r'<link href="%s" type="text/css" media="all" ' |
| 80 | + 'rel="stylesheet"( /)?>' % path |
| 81 | + for path in ( |
| 82 | + '/static/extra1.css', |
| 83 | + '/static/extra2.css', |
| 84 | + '/static/styles1.min.css', |
| 85 | + '/static/styles2.min.css', |
| 86 | + ) |
| 87 | + ] + [ |
| 88 | + r'<link href="/static/print.min.css" type="text/css" ' |
| 89 | + 'media="print" rel="stylesheet"( /)?>' |
| 90 | + ] |
| 91 | + for rendered_node, expected_node in zip( |
| 92 | + media.render_css(), expected_regex |
| 93 | + ): |
| 94 | + self.assertRegex(rendered_node, expected_node) |
94 | 95 |
|
95 | 96 | @pipeline_settings(PIPELINE_ENABLED=False)
|
96 | 97 | def test_css_packages_with_pipeline_disabled(self):
|
@@ -120,22 +121,25 @@ class MyMedia(PipelineFormMedia):
|
120 | 121 | 'print': ['pipeline/css/urls.css'],
|
121 | 122 | })
|
122 | 123 | self.assertEqual(MyMedia.css, media._css)
|
123 |
| - self.assertEqual( |
124 |
| - list(media.render_css()), |
125 |
| - [ |
126 |
| - '<link href="%s" type="text/css" media="all" ' |
127 |
| - 'rel="stylesheet" />' % path |
128 |
| - for path in ( |
129 |
| - '/static/extra1.css', |
130 |
| - '/static/extra2.css', |
131 |
| - '/static/pipeline/css/first.css', |
132 |
| - '/static/pipeline/css/second.css', |
133 |
| - '/static/pipeline/css/unicode.css', |
134 |
| - ) |
135 |
| - ] + [ |
136 |
| - '<link href="/static/pipeline/css/urls.css" type="text/css" ' |
137 |
| - 'media="print" rel="stylesheet" />' |
138 |
| - ]) |
| 124 | + |
| 125 | + expected_regex = [ |
| 126 | + '<link href="%s" type="text/css" media="all" ' |
| 127 | + 'rel="stylesheet"( /)?>' % path |
| 128 | + for path in ( |
| 129 | + '/static/extra1.css', |
| 130 | + '/static/extra2.css', |
| 131 | + '/static/pipeline/css/first.css', |
| 132 | + '/static/pipeline/css/second.css', |
| 133 | + '/static/pipeline/css/unicode.css', |
| 134 | + ) |
| 135 | + ] + [ |
| 136 | + '<link href="/static/pipeline/css/urls.css" type="text/css" ' |
| 137 | + 'media="print" rel="stylesheet"( /)?>' |
| 138 | + ] |
| 139 | + for rendered_node, expected_node in zip( |
| 140 | + media.render_css(), expected_regex |
| 141 | + ): |
| 142 | + self.assertRegex(rendered_node, expected_node) |
139 | 143 |
|
140 | 144 | @pipeline_settings(PIPELINE_ENABLED=True)
|
141 | 145 | def test_js_packages_with_pipeline_enabled(self):
|
|
0 commit comments