fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaning: timezone issues, deprecated urls.py imports, missing notes.
[wolnelektury.git]
/
apps
/
catalogue
/
tests
/
tags.py
diff --git
a/apps/catalogue/tests/tags.py
b/apps/catalogue/tests/tags.py
index
3eab3da
..
503b98b
100644
(file)
--- a/
apps/catalogue/tests/tags.py
+++ b/
apps/catalogue/tests/tags.py
@@
-1,4
+1,7
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
from django.core.files.base import ContentFile
from django.test import Client
from catalogue import models
from django.core.files.base import ContentFile
from django.test import Client
from catalogue import models
@@
-225,7
+228,7
@@
class TestIdenticalTag(WLTestCase):
related_info = book.related_info()
related_themes = book.related_themes()
for category in 'author', 'kind', 'genre', 'epoch':
related_info = book.related_info()
related_themes = book.related_themes()
for category in 'author', 'kind', 'genre', 'epoch':
- self.assertTrue('tag' in [tag[
1
] for tag in related_info['tags'][category]],
+ self.assertTrue('tag' in [tag[
'slug'
] for tag in related_info['tags'][category]],
'missing related tag for %s' % category)
self.assertTrue('tag' in [tag.slug for tag in related_themes])
'missing related tag for %s' % category)
self.assertTrue('tag' in [tag.slug for tag in related_themes])
@@
-270,19
+273,18
@@
class BookTagsTests(WLTestCase):
related_info = book.related_info()
related_themes = book.related_themes()
related_info = book.related_info()
related_themes = book.related_themes()
- self.assertEqual(
related_info['tags']['author'
],
- [
('Common Man', 'common-man')
])
- self.assertEqual(
related_info['tags']['kind'
],
- [
('Kind', 'kind')
])
+ self.assertEqual(
[t['slug'] for t in related_info['tags']['author']
],
+ [
'common-man'
])
+ self.assertEqual(
[t['slug'] for t in related_info['tags']['kind']
],
+ [
'kind'
])
self.assertEqual([(tag.name, tag.count) for tag in related_themes],
[('ChildTheme', 1), ('ParentTheme', 1), ('Theme', 2)])
self.assertEqual([(tag.name, tag.count) for tag in related_themes],
[('ChildTheme', 1), ('ParentTheme', 1), ('Theme', 2)])
- def test_
main_pag
e_tags(self):
+ def test_
catalogu
e_tags(self):
""" test main page tags and counts """
""" test main page tags and counts """
- from catalogue.templatetags.catalogue_tags import catalogue_menu
- menu = catalogue_menu()
- self.assertEqual([(tag.name, tag.book_count) for tag in menu['author']],
+ context = self.client.get('/katalog/').context
+ self.assertEqual([(tag.name, tag.book_count) for tag in context['categories']['author']],
[('Jim Lazy', 1), ('Common Man', 1)])
[('Jim Lazy', 1), ('Common Man', 1)])
- self.assertEqual([(tag.name, tag.book_count) for tag in
menu
['theme']],
+ self.assertEqual([(tag.name, tag.book_count) for tag in
context['categories']
['theme']],
[('ChildTheme', 1), ('ParentTheme', 1), ('Theme', 2)])
[('ChildTheme', 1), ('ParentTheme', 1), ('Theme', 2)])