Upgrades

[wolnelektury.git] / src / catalogue / tests / test_visit.py

diff --git a/src/catalogue/tests/test_visit.py b/src/catalogue/tests/test_visit.py
index 6d31b5e..83d5e0b 100644 (file)
--- a/src/catalogue/tests/test_visit.py
+++ b/src/catalogue/tests/test_visit.py
@@ -1,4 +1,3 @@
-# -*- 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.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -14,7 +13,7 @@ class VisitTest(WLTestCase):
         WLTestCase.setUp(self)
         author = PersonStub(("Jane",), "Doe")
         book_info = BookInfoStub(author=author, genre="Sielanka",
         WLTestCase.setUp(self)
         author = PersonStub(("Jane",), "Doe")
         book_info = BookInfoStub(author=author, genre="Sielanka",

-            epoch='Epoch', kind="Kind", **info_args(u"A book"))
+            epoch='Epoch', kind="Kind", **info_args("A book"))

         self.book = models.Book.from_text_and_meta(ContentFile('''
             <utwor>
             <opowiadanie>
         self.book = models.Book.from_text_and_meta(ContentFile('''
             <utwor>
             <opowiadanie>


@@ -47,10 +46,6 @@ class VisitTest(WLTestCase):
                 'daisy/',
                 # 'autor/jane-doe/gatunek/genre/',
                 # 'autor/jane-doe/gatunek/genre/motyw/sielanka/',
                 'daisy/',
                 # 'autor/jane-doe/gatunek/genre/',
                 # 'autor/jane-doe/gatunek/genre/motyw/sielanka/',

-                'b/%d/short.pl.html' % self.book.pk,
-                'b/%d/wide.pl.html' % self.book.pk,
-                'f/%d/promo.pl.html' % self.book.fragments.all()[0].pk,
-                'f/%d/short.pl.html' % self.book.fragments.all()[0].pk,

                 ],
             404: [
                 'lektury/nonexistent/',  # Nonexistent Collection.
                 ],
             404: [
                 'lektury/nonexistent/',  # Nonexistent Collection.


@@ -61,10 +56,6 @@ class VisitTest(WLTestCase):
                 'autor/nonexistent/',  # Nonexistent author.
                 'motyw/nonexistent/',  # Nonexistent theme.
                 'zh.json',  # Nonexistent language.
                 'autor/nonexistent/',  # Nonexistent author.
                 'motyw/nonexistent/',  # Nonexistent theme.
                 'zh.json',  # Nonexistent language.

-                'b/%d/short.pl.html' % (self.book.pk + 100),  # Nonexistent book.
-                'b/%d/wide.pl.html' % (self.book.pk + 100),  # Nonexistent book.
-                'f/%d/promo.pl.html' % (self.book.fragments.all()[0].pk + 100),  # Nonexistent fragment.
-                'f/%d/short.pl.html' % (self.book.fragments.all()[0].pk + 100),  # Nonexistent fragment.

                 ]
             }
         prefix = '/katalog/'
                 ]
             }
         prefix = '/katalog/'