Skip to content

Commit 3c488e2

Browse files
committed
Merge pull request #12 from josernestodavila/templatetags_tests
Added simple tests for the Magicembed Template Tags.
2 parents 56d2198 + 3cd841f commit 3c488e2

10 files changed

Lines changed: 44 additions & 25 deletions

.coverage

387 Bytes
Binary file not shown.

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Current or previous core committers
22

33
Adolfo Fitoria
44
Andres Reyes
5+
José Ernesto Dávila Pantoja
56
Oscar Cortez
67

78
* Your name could stand here :)
108 Bytes
Loading

magicembed/tests/coverage/errors.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<body>
4545

4646
<div id="content-header">
47-
<h1>Test Coverage Report: error packages and modules</h1><p>Generated: Sat 2015-08-29 16:25 CST</p></div>
47+
<h1>Test Coverage Report: error packages and modules</h1><p>Generated: Mon 2015-09-07 14:04 CST</p></div>
4848
<div id="result-list">
4949
<p> <code>django_coverage.utils.module_tools.find_or_load_module</code> had
5050
problems importing these packages and modules:

magicembed/tests/coverage/excludes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<body>
4545

4646
<div id="content-header">
47-
<h1>Test Coverage Report: excluded packages and modules</h1><p>Generated: Sat 2015-08-29 16:25 CST</p></div>
47+
<h1>Test Coverage Report: excluded packages and modules</h1><p>Generated: Mon 2015-09-07 14:04 CST</p></div>
4848
<div id="result-list">
4949
<p> These packages and modules were excluded from the coverage analysis in
5050
<code>django.conf.settings.COVERAGE_MODULE_EXCLUDES</code> or they do

magicembed/tests/coverage/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116

117117
<div id="content-header">
118118
<h1>Test Coverage Report</h1>
119-
<p>Generated: Sat 2015-08-29 16:25 CST</p>
119+
<p>Generated: Mon 2015-09-07 14:04 CST</p>
120120
<p><img src="coverage_status.png"></p>
121121
</div>
122122

@@ -139,9 +139,9 @@ <h1>Test Coverage Report</h1>
139139
<tr>
140140
<td class="module-name">Total</td>
141141
<td>72</td>
142-
<td>48</td>
142+
<td>57</td>
143143
<td>10</td>
144-
<td>77.4%</td>
144+
<td>91.9%</td>
145145
</tr>
146146
</tfoot>
147147
<tbody>
@@ -164,9 +164,9 @@ <h1>Test Coverage Report</h1>
164164
<tr>
165165
<td class="module-name"><a href="modules/magicembed.templatetags.magicembed_tags.html">magicembed.templatetags.magicembed_tags</a></td>
166166
<td>12</td>
167-
<td>0</td>
167+
<td>9</td>
168168
<td>3</td>
169-
<td class="critical">0.0%</td>
169+
<td class="normal">100.0%</td>
170170
</tr>
171171

172172
</tbody>

magicembed/tests/coverage/modules/magicembed.__init__.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ <h1>
129129
1 total statements,
130130
<span class="normal">100.0% covered</span>
131131
</h1>
132-
<p>Generated: Sat 2015-08-29 16:25 CST</p>
133-
<p>Source file: /home/jdavila/workspace/django/Proyectos/django-magicembed/magicembed/__init__.py</p>
132+
<p>Generated: Mon 2015-09-07 14:04 CST</p>
133+
<p>Source file: /home/jdavila/workspace/django/django-magicembed/magicembed/__init__.py</p>
134134
<p>
135135
Stats:
136136
<span class="executed">0 executed</span>,

magicembed/tests/coverage/modules/magicembed.providers.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ <h1>
130130
59 total statements,
131131
<span class="normal">90.6% covered</span>
132132
</h1>
133-
<p>Generated: Sat 2015-08-29 16:25 CST</p>
134-
<p>Source file: /home/jdavila/workspace/django/Proyectos/django-magicembed/magicembed/providers.py</p>
133+
<p>Generated: Mon 2015-09-07 14:04 CST</p>
134+
<p>Source file: /home/jdavila/workspace/django/django-magicembed/magicembed/providers.py</p>
135135
<p>
136136
Stats:
137137
<span class="executed">48 executed</span>,

magicembed/tests/coverage/modules/magicembed.templatetags.magicembed_tags.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@
127127
<h1>
128128
<span id="module-name">magicembed.templatetags.magicembed_tags</span>:
129129
12 total statements,
130-
<span class="critical">0.0% covered</span>
130+
<span class="normal">100.0% covered</span>
131131
</h1>
132-
<p>Generated: Sat 2015-08-29 16:25 CST</p>
133-
<p>Source file: /home/jdavila/workspace/django/Proyectos/django-magicembed/magicembed/templatetags/magicembed_tags.py</p>
132+
<p>Generated: Mon 2015-09-07 14:04 CST</p>
133+
<p>Source file: /home/jdavila/workspace/django/django-magicembed/magicembed/templatetags/magicembed_tags.py</p>
134134
<p>
135135
Stats:
136-
<span class="executed">0 executed</span>,
137-
<span class="missed">9 missed</span>,
136+
<span class="executed">9 executed</span>,
137+
<span class="missed">0 missed</span>,
138138
<span class="excluded">3 excluded</span>,
139139
<span class="ignored">13 ignored</span>
140140
</p>
@@ -148,25 +148,25 @@ <h1>
148148
<li class="ignored"><code></code></li>
149149
<li class="excluded"><code>from magicembed.providers import get_provider</code></li>
150150
<li class="ignored"><code></code></li>
151-
<li class="missed"><code>register = template.Library()</code></li>
151+
<li class="executed"><code>register = template.Library()</code></li>
152152
<li class="ignored"><code></code></li>
153153
<li class="ignored"><code></code></li>
154-
<li class="missed"><code>@register.filter(is_safe=True)</code></li>
155-
<li class="missed"><code>def magicembed(value, arg=None):</code></li>
154+
<li class="executed"><code>@register.filter(is_safe=True)</code></li>
155+
<li class="executed"><code>def magicembed(value, arg=None):</code></li>
156156
<li class="ignored"><code> '''value is the url and arg the size tuple</code></li>
157157
<li class="ignored"><code> ussage: {% http://myurl.com/|magicembed:"640x480" %}'''</code></li>
158-
<li class="missed"><code> arg = [int(item) for item in arg.split('x')]</code></li>
159-
<li class="missed"><code> provider = get_provider(value, arg)</code></li>
158+
<li class="executed"><code> arg = [int(item) for item in arg.split('x')]</code></li>
159+
<li class="executed"><code> provider = get_provider(value, arg)</code></li>
160160
<li class="ignored"><code></code></li>
161-
<li class="missed"><code> return mark_safe(provider.render_video())</code></li>
161+
<li class="executed"><code> return mark_safe(provider.render_video())</code></li>
162162
<li class="ignored"><code></code></li>
163163
<li class="ignored"><code></code></li>
164-
<li class="missed"><code>@register.filter</code></li>
164+
<li class="executed"><code>@register.filter</code></li>
165165
<li class="ignored"><code>def magicthumbnail(value):</code></li>
166166
<li class="ignored"><code> '''value is the url and arg the link_to another url</code></li>
167167
<li class="ignored"><code> ussage: {% http://myurl.com/|magicthumbnail: '/some/url' %}'''</code></li>
168-
<li class="missed"><code> provider = get_provider(value)</code></li>
169-
<li class="missed"><code> return provider.render_thumbnail()</code></li>
168+
<li class="executed"><code> provider = get_provider(value)</code></li>
169+
<li class="executed"><code> return provider.render_thumbnail()</code></li>
170170
</ol>
171171
</div>
172172

magicembed/tests/test.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
from mock import MagicMock, patch
55

6+
from django.template import Template, Context
7+
68
from magicembed.providers import (Youtube, Vimeo, Embedly, get_provider)
79

810

@@ -53,5 +55,21 @@ def test_return_provider(self):
5355
self.assertTrue(isinstance(get_provider(vimeo), Vimeo))
5456
self.assertTrue(isinstance(get_provider(blip), Embedly))
5557

58+
59+
class TemplateTagsTest(unittest.TestCase):
60+
61+
def test_magicembed_tag(self):
62+
TEMPLATE = Template('''{% load magicembed_tags %} {{ 'http://vimeo.com/21443752/'|magicembed:"400x225" }}''')
63+
rendered = TEMPLATE.render(Context({}))
64+
self.assertIn("Vimeo video player", rendered, msg="title is not present.")
65+
66+
def test_magicthumbnail_tag(self):
67+
thumbnail = '''http://i.vimeocdn.com/video/137933005_200x150.jpg'''
68+
TEMPLATE = Template('''{% load magicembed_tags %} {{ 'http://vimeo.com/21443752/'|magicthumbnail }}''')
69+
70+
rendered = TEMPLATE.render(Context({}))
71+
self.assertIn(thumbnail, rendered)
72+
73+
5674
if __name__ == '__main__':
5775
unittest.main()

0 commit comments

Comments
 (0)