X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/35ccafef8a83575ac0bf5901b58630033aa95d1e..dfd584e3b136d770bf56569030d10712a8722569:/apps/catalogue/tests/bookmedia.py?ds=sidebyside

diff --git a/apps/catalogue/tests/bookmedia.py b/apps/catalogue/tests/bookmedia.py
index 7e75ac376..2d3cf539d 100644
--- a/apps/catalogue/tests/bookmedia.py
+++ b/apps/catalogue/tests/bookmedia.py
@@ -1,6 +1,10 @@
 # -*- 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.conf import settings
 from os.path import basename, exists, join, dirname
-from django.core.files.base import ContentFile, File
+from django.core.files.base import ContentFile
 
 from catalogue.test_utils import *
 from catalogue import models, utils
@@ -14,13 +18,13 @@ class BookMediaTests(WLTestCase):
         self.book = models.Book.objects.create(slug='test-book')
 
     def test_diacritics(self):
-        bm = models.BookMedia(book=self.book, type="ogg", 
+        bm = models.BookMedia(book=self.book, type="ogg",
                     name=u"Zażółć gęślą jaźń")
         bm.file.save(None, self.file)
         self.assertEqual(basename(bm.file.name), 'zazolc-gesla-jazn.ogg')
 
     def test_long_name(self):
-        bm = models.BookMedia(book=self.book, type="ogg", 
+        bm = models.BookMedia(book=self.book, type="ogg",
                     name="Some very very very very very very very very very very very very very very very very long file name")
         bm.file.save(bm.name, self.file)
 
@@ -87,8 +91,8 @@ class BookMediaTests(WLTestCase):
 
     def test_zip_audiobooks(self):
         paths = [
-            join(dirname(__file__), "files/fraszka-do-anusie.xml"),
-            join(dirname(__file__), "files/fraszki.xml")
+            (None, join(dirname(__file__), "files/fraszka-do-anusie.xml")),
+            (None, join(dirname(__file__), "files/fraszki.xml")),
             ]
 
         url = utils.create_zip(paths, 'test-zip-slug')
@@ -102,9 +106,9 @@ class BookMediaTests(WLTestCase):
         bm = models.BookMedia(book=self.book, type='ogg', name="Title")
         bm.file.save(None, self.file)
         bm.save()
-        
-        zip_url = self.book.zip_audiobooks()
-        self.assertEqual('zip/'+self.book.slug+'.zip', zip_url)
+
+        zip_url = self.book.zip_audiobooks('ogg')
+        self.assertEqual('zip/'+self.book.slug+'_ogg.zip', zip_url)
         self.assertTrue(exists(join(settings.MEDIA_ROOT, zip_url)))
 
         bm2 = models.BookMedia(book=self.book, type='ogg', name="Other title")