Test fix

[wolnelektury.git] / apps / catalogue / tests / tags.py

diff --git a/apps/catalogue/tests/tags.py b/apps/catalogue/tests/tags.py
index 7e6e667..2608eb6 100644 (file)
--- a/apps/catalogue/tests/tags.py
+++ b/apps/catalogue/tests/tags.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
+from django.core.files.base import ContentFile
+from django.test import Client
 from catalogue import models
 from catalogue.test_utils import *
-from django.core.files.base import ContentFile
-
-from nose.tools import raises
 
 
 class BooksByTagTests(WLTestCase):
@@ -66,12 +65,12 @@ class BooksByTagTests(WLTestCase):
                          ['Child'])
 
 
-
 class TagRelatedTagsTests(WLTestCase):
     """ tests the /katalog/category/tag/ page for related tags """
 
     def setUp(self):
         WLTestCase.setUp(self)
+        self.client = Client()
         author = PersonStub(("Common",), "Man")
 
         gchild_info = BookInfoStub(author=author, genre="GchildGenre", epoch='Epoch', kind="Kind",
@@ -132,14 +131,14 @@ class TagRelatedTagsTests(WLTestCase):
     def test_related_differ(self):
         """ related tags shouldn't include filtering tags """
 
-        cats = self.client.get('/katalog/rodzaj/kind/').context['categories']
+        response = self.client.get('/katalog/rodzaj/kind/')
+        cats = response.context['categories']
         self.assertFalse('Kind' in [tag.name for tag in cats['kind']],
                          'filtering tag wrongly included in related')
         cats = self.client.get('/katalog/motyw/theme/').context['categories']
         self.assertFalse('Theme' in [tag.name for tag in cats['theme']],
                          'filtering theme wrongly included in related')
 
-
     def test_parent_tag_once(self):
         """ if parent and descendants have a common tag, count it only once """
 
@@ -175,7 +174,7 @@ class CleanTagRelationTests(WLTestCase):
             <end id="m01" />
             </akap></opowiadanie></utwor>
             """
-        book = models.Book.from_text_and_meta(ContentFile(book_text), book_info)
+        self.book = models.Book.from_text_and_meta(ContentFile(book_text), book_info)
 
     def test_delete_objects(self):
         """ there should be no related tags left after deleting some objects """
@@ -192,8 +191,8 @@ class CleanTagRelationTests(WLTestCase):
         """ there should be no tag relations left after deleting tags """
 
         models.Tag.objects.all().delete()
-        cats = self.client.get('/katalog/lektura/book/').context['categories']
-        self.assertEqual(cats, {})
+        self.assertEqual(len(self.book.related_info()['tags']), 0)
+        self.assertEqual(len(self.book.related_themes()), 0)
         self.assertEqual(models.Tag.intermediary_table_model.objects.all().count(), 0,
                          "orphaned TagRelation objects left")
 
@@ -221,13 +220,14 @@ class TestIdenticalTag(WLTestCase):
 
     def test_book_tags(self):
         """ there should be all related tags in relevant categories """
-        models.Book.from_text_and_meta(ContentFile(self.book_text), self.book_info)
+        book = models.Book.from_text_and_meta(ContentFile(self.book_text), self.book_info)
 
-        context = self.client.get('/katalog/lektura/tag/').context
+        related_info = book.related_info()
+        related_themes = book.related_themes()
         for category in 'author', 'kind', 'genre', 'epoch':
-            self.assertTrue('tag' in [tag.slug for tag in context['categories'][category]],
+            self.assertTrue('tag' in [tag[1] for tag in related_info['tags'][category]],
                             'missing related tag for %s' % category)
-        self.assertTrue('tag' in [tag.slug for tag in context['book_themes']])
+        self.assertTrue('tag' in [tag.slug for tag in related_themes])
 
     def test_qualified_url(self):
         models.Book.from_text_and_meta(ContentFile(self.book_text), self.book_info)
@@ -261,27 +261,27 @@ class BookTagsTests(WLTestCase):
                 <end id="m01" />
                 </akap></opowiadanie></utwor>
                 """ % info.title.encode('utf-8')
-            book = models.Book.from_text_and_meta(ContentFile(book_text), info)
+            models.Book.from_text_and_meta(ContentFile(book_text), info)
 
     def test_book_tags(self):
         """ book should have own tags and whole tree's themes """
 
-        context = self.client.get('/katalog/lektura/parent/').context
+        book = models.Book.objects.get(slug='parent')
+        related_info = book.related_info()
+        related_themes = book.related_themes()
 
-        self.assertEqual([tag.name for tag in context['categories']['author']],
-                         ['Common Man'])
-        self.assertEqual([tag.name for tag in context['categories']['kind']],
-                         ['Kind'])
-        self.assertEqual([(tag.name, tag.count) for tag in context['book_themes']],
+        self.assertEqual(related_info['tags']['author'],
+                         [('Common Man', 'common-man')])
+        self.assertEqual(related_info['tags']['kind'],
+                         [('Kind', 'kind')])
+        self.assertEqual([(tag.name, tag.count) for tag in related_themes],
                          [('ChildTheme', 1), ('ParentTheme', 1), ('Theme', 2)])
 
-    def test_main_page_tags(self):
+    def test_catalogue_tags(self):
         """ test main page tags and counts """
-
         context = self.client.get('/katalog/').context
-
-        self.assertEqual([(tag.name, tag.count) for tag in context['categories']['author']],
+        self.assertEqual([(tag.name, tag.book_count) for tag in context['categories']['author']],
                          [('Jim Lazy', 1), ('Common Man', 1)])
-        self.assertEqual([(tag.name, tag.count) for tag in context['fragment_tags']],
+        self.assertEqual([(tag.name, tag.book_count) for tag in context['categories']['theme']],
                          [('ChildTheme', 1), ('ParentTheme', 1), ('Theme', 2)])