Merge branch 'obrazy' into rwd

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

diff --git a/apps/catalogue/tests/bookmedia.py b/apps/catalogue/tests/bookmedia.py
index 7e75ac3..da427e8 100644 (file)
--- a/apps/catalogue/tests/bookmedia.py
+++ b/apps/catalogue/tests/bookmedia.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+from django.conf import settings

 from os.path import basename, exists, join, dirname
 from django.core.files.base import ContentFile, File
 
 from os.path import basename, exists, join, dirname
 from django.core.files.base import ContentFile, File
 


@@ -87,8 +88,8 @@ class BookMediaTests(WLTestCase):
 
     def test_zip_audiobooks(self):
         paths = [
 
     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')
             ]
 
         url = utils.create_zip(paths, 'test-zip-slug')


@@ -103,8 +104,8 @@ class BookMediaTests(WLTestCase):
         bm.file.save(None, self.file)
         bm.save()
         
         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")
         self.assertTrue(exists(join(settings.MEDIA_ROOT, zip_url)))
 
         bm2 = models.BookMedia(book=self.book, type='ogg', name="Other title")