Compare commits
3 commits
c21d040202
...
7569447baa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7569447baa | ||
|
|
9f08ec332f | ||
|
|
e075a9e749 |
2 changed files with 30 additions and 30 deletions
|
|
@ -311,22 +311,22 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "add_nastaveni",
|
"codename": "add_nastaveni",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "various",
|
||||||
"ct_model": "nastaveni"
|
"ct_model": "nastaveni"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "change_nastaveni",
|
"codename": "change_nastaveni",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "various",
|
||||||
"ct_model": "nastaveni"
|
"ct_model": "nastaveni"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "delete_nastaveni",
|
"codename": "delete_nastaveni",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "various",
|
||||||
"ct_model": "nastaveni"
|
"ct_model": "nastaveni"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "view_nastaveni",
|
"codename": "view_nastaveni",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "various",
|
||||||
"ct_model": "nastaveni"
|
"ct_model": "nastaveni"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -351,22 +351,22 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "change_organizator",
|
"codename": "change_organizator",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "organizator"
|
"ct_model": "organizator"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "view_organizator",
|
"codename": "view_organizator",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "organizator"
|
"ct_model": "organizator"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "change_osoba",
|
"codename": "change_osoba",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "osoba"
|
"ct_model": "osoba"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "view_osoba",
|
"codename": "view_osoba",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "osoba"
|
"ct_model": "osoba"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -391,22 +391,22 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "add_prijemce",
|
"codename": "add_prijemce",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "prijemce"
|
"ct_model": "prijemce"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "change_prijemce",
|
"codename": "change_prijemce",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "prijemce"
|
"ct_model": "prijemce"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "delete_prijemce",
|
"codename": "delete_prijemce",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "prijemce"
|
"ct_model": "prijemce"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "view_prijemce",
|
"codename": "view_prijemce",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "prijemce"
|
"ct_model": "prijemce"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -431,12 +431,12 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "change_resitel",
|
"codename": "change_resitel",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "resitel"
|
"ct_model": "resitel"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "view_resitel",
|
"codename": "view_resitel",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "resitel"
|
"ct_model": "resitel"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -461,22 +461,22 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "add_skola",
|
"codename": "add_skola",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "skola"
|
"ct_model": "skola"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "change_skola",
|
"codename": "change_skola",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "skola"
|
"ct_model": "skola"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "delete_skola",
|
"codename": "delete_skola",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "skola"
|
"ct_model": "skola"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"codename": "view_skola",
|
"codename": "view_skola",
|
||||||
"ct_app_label": "seminar",
|
"ct_app_label": "personalni",
|
||||||
"ct_model": "skola"
|
"ct_model": "skola"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -6,18 +6,18 @@ class MailTagsTest(TestCase):
|
||||||
"""Testuje template tagy ohledně mailů."""
|
"""Testuje template tagy ohledně mailů."""
|
||||||
def test_maillink(self):
|
def test_maillink(self):
|
||||||
# Tohle nedává smysl dělit do víc funkcí, bylo by v nich víc boilerplatu než užitečného kódu.
|
# Tohle nedává smysl dělit do víc funkcí, bylo by v nich víc boilerplatu než užitečného kódu.
|
||||||
self.assertEquals(maillink('Hello', to='some@body.test'), r'<a href="mailto:some@body.test">Hello</a>')
|
self.assertEqual(maillink('Hello', to='some@body.test'), r'<a href="mailto:some@body.test">Hello</a>')
|
||||||
self.assertEquals(maillink('Hello', to=['some@body.test']), r'<a href="mailto:some@body.test">Hello</a>')
|
self.assertEqual(maillink('Hello', to=['some@body.test']), r'<a href="mailto:some@body.test">Hello</a>')
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
maillink('Hello', to=['alice@test.test', 'bob@jinde.test']),
|
maillink('Hello', to=['alice@test.test', 'bob@jinde.test']),
|
||||||
r'<a href="mailto:alice@test.test,bob@jinde.test">Hello</a>',
|
r'<a href="mailto:alice@test.test,bob@jinde.test">Hello</a>',
|
||||||
)
|
)
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
maillink('Hello', to='some@body.test', attrs='class="trida" id="id"'),
|
maillink('Hello', to='some@body.test', attrs='class="trida" id="id"'),
|
||||||
r'<a href="mailto:some@body.test" class="trida" id="id">Hello</a>',
|
r'<a href="mailto:some@body.test" class="trida" id="id">Hello</a>',
|
||||||
)
|
)
|
||||||
# Následující test toho testuje moc zároveň, měly by předcházet dedikované testy… (kašlu na ně :-P)
|
# Následující test toho testuje moc zároveň, měly by předcházet dedikované testy… (kašlu na ně :-P)
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
maillink('Text odkazu', to='prijemce@wtf.test', subject="Předmět", body="Čau"),
|
maillink('Text odkazu', to='prijemce@wtf.test', subject="Předmět", body="Čau"),
|
||||||
r'<a href="mailto:prijemce@wtf.test?subject=P%C5%99edm%C4%9Bt&body=%C4%8Cau">Text odkazu</a>',
|
r'<a href="mailto:prijemce@wtf.test?subject=P%C5%99edm%C4%9Bt&body=%C4%8Cau">Text odkazu</a>',
|
||||||
)
|
)
|
||||||
|
|
@ -25,10 +25,10 @@ class MailTagsTest(TestCase):
|
||||||
self.assertRaises(TypeError, lambda: maillink()) # Nemá text, takže to shodí python
|
self.assertRaises(TypeError, lambda: maillink()) # Nemá text, takže to shodí python
|
||||||
|
|
||||||
def test_mailurl(self):
|
def test_mailurl(self):
|
||||||
self.assertEquals(mailurl(to='some@body.test'), r'mailto:some@body.test')
|
self.assertEqual(mailurl(to='some@body.test'), r'mailto:some@body.test')
|
||||||
self.assertEquals(mailurl(to=['some@body.test']), r'mailto:some@body.test')
|
self.assertEqual(mailurl(to=['some@body.test']), r'mailto:some@body.test')
|
||||||
self.assertEquals(mailurl(to=['alice@test.test', 'bob@jinde.test']), r'mailto:alice@test.test,bob@jinde.test')
|
self.assertEqual(mailurl(to=['alice@test.test', 'bob@jinde.test']), r'mailto:alice@test.test,bob@jinde.test')
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
mailurl(to='some@body.test', body='Tělo', subject='Předmět'),
|
mailurl(to='some@body.test', body='Tělo', subject='Předmět'),
|
||||||
r'mailto:some@body.test?subject=P%C5%99edm%C4%9Bt&body=T%C4%9Blo',
|
r'mailto:some@body.test?subject=P%C5%99edm%C4%9Bt&body=T%C4%9Blo',
|
||||||
)
|
)
|
||||||
|
|
@ -48,7 +48,7 @@ class MailTagsTest(TestCase):
|
||||||
# TODO: Vyzkoušet i víc adresátů. (Nepamatuji si z hlavy syntaxi…)
|
# TODO: Vyzkoušet i víc adresátů. (Nepamatuji si z hlavy syntaxi…)
|
||||||
r'{% maillink "Text" to="alice@test.test" subject="Oprava řešení" %}'
|
r'{% maillink "Text" to="alice@test.test" subject="Oprava řešení" %}'
|
||||||
)
|
)
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
render_template(template),
|
render_template(template),
|
||||||
r'<a href="mailto:alice@test.test?subject=Oprava%20%C5%99e%C5%A1en%C3%AD">Text</a>',
|
r'<a href="mailto:alice@test.test?subject=Oprava%20%C5%99e%C5%A1en%C3%AD">Text</a>',
|
||||||
)
|
)
|
||||||
|
|
@ -57,4 +57,4 @@ class MailTagsTest(TestCase):
|
||||||
r'{% load mail %}'
|
r'{% load mail %}'
|
||||||
r'{% mailurl to="alice@test.test" subject="Čau Alice" %}'
|
r'{% mailurl to="alice@test.test" subject="Čau Alice" %}'
|
||||||
)
|
)
|
||||||
self.assertEquals(render_template(mailurltemplate), r'mailto:alice@test.test?subject=%C4%8Cau%20Alice')
|
self.assertEqual(render_template(mailurltemplate), r'mailto:alice@test.test?subject=%C4%8Cau%20Alice')
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue