fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix test
[wolnelektury.git]
/
apps
/
catalogue
/
tests
/
book_import.py
diff --git
a/apps/catalogue/tests/book_import.py
b/apps/catalogue/tests/book_import.py
index
a97c417
..
c8689ea
100644
(file)
--- a/
apps/catalogue/tests/book_import.py
+++ b/
apps/catalogue/tests/book_import.py
@@
-7,15
+7,14
@@
from catalogue import models
from librarian import WLURI
from nose.tools import raises
from librarian import WLURI
from nose.tools import raises
-import tempfile
-from os import unlink, path, makedirs
+from os import path, makedirs
class BookImportLogicTests(WLTestCase):
def setUp(self):
WLTestCase.setUp(self)
self.book_info = BookInfoStub(
class BookImportLogicTests(WLTestCase):
def setUp(self):
WLTestCase.setUp(self)
self.book_info = BookInfoStub(
- url=WLURI.from_slug
_and_lang(u"default-book", None
),
+ url=WLURI.from_slug
(u"default-book"
),
about=u"http://wolnelektury.pl/example/URI/default_book",
title=u"Default Book",
author=PersonStub(("Jim",), "Lazy"),
about=u"http://wolnelektury.pl/example/URI/default_book",
title=u"Default Book",
author=PersonStub(("Jim",), "Lazy"),
@@
-114,7
+113,7
@@
class BookImportLogicTests(WLTestCase):
@raises(ValueError)
def test_book_with_invalid_slug(self):
""" Book with invalid characters in slug shouldn't be imported """
@raises(ValueError)
def test_book_with_invalid_slug(self):
""" Book with invalid characters in slug shouldn't be imported """
- self.book_info.url = WLURI.from_slug
_and_lang(u"default_book", None
)
+ self.book_info.url = WLURI.from_slug
(u"default_book"
)
BOOK_TEXT = "<utwor />"
book = models.Book.from_text_and_meta(ContentFile(BOOK_TEXT), self.book_info)
BOOK_TEXT = "<utwor />"
book = models.Book.from_text_and_meta(ContentFile(BOOK_TEXT), self.book_info)
@@
-237,9
+236,7
@@
class ChildImportTests(WLTestCase):
</opowiadanie></utwor>
"""
child = models.Book.from_text_and_meta(ContentFile(CHILD_TEXT), self.child_info, overwrite=True)
</opowiadanie></utwor>
"""
child = models.Book.from_text_and_meta(ContentFile(CHILD_TEXT), self.child_info, overwrite=True)
-
- themes = self.client.get(parent.get_absolute_url()).context['book_themes']
-
+ themes = parent.related_themes()
self.assertEqual(['Kot'], [tag.name for tag in themes],
'wrong related theme list')
self.assertEqual(['Kot'], [tag.name for tag in themes],
'wrong related theme list')
@@
-247,12
+244,15
@@
class ChildImportTests(WLTestCase):
class MultilingualBookImportTest(WLTestCase):
def setUp(self):
WLTestCase.setUp(self)
class MultilingualBookImportTest(WLTestCase):
def setUp(self):
WLTestCase.setUp(self)
+ common_uri = WLURI.from_slug('common-slug')
+
self.pol_info = BookInfoStub(
genre='X-Genre',
epoch='X-Epoch',
kind='X-Kind',
author=PersonStub(("Joe",), "Doe"),
self.pol_info = BookInfoStub(
genre='X-Genre',
epoch='X-Epoch',
kind='X-Kind',
author=PersonStub(("Joe",), "Doe"),
- **info_args("A book")
+ variant_of=common_uri,
+ **info_args(u"Książka")
)
self.eng_info = BookInfoStub(
)
self.eng_info = BookInfoStub(
@@
-260,6
+260,7
@@
class MultilingualBookImportTest(WLTestCase):
epoch='X-Epoch',
kind='X-Kind',
author=PersonStub(("Joe",), "Doe"),
epoch='X-Epoch',
kind='X-Kind',
author=PersonStub(("Joe",), "Doe"),
+ variant_of=common_uri,
**info_args("A book", "eng")
)
**info_args("A book", "eng")
)
@@
-279,26
+280,31
@@
class MultilingualBookImportTest(WLTestCase):
class BookImportGenerateTest(WLTestCase):
def setUp(self):
WLTestCase.setUp(self)
class BookImportGenerateTest(WLTestCase):
def setUp(self):
WLTestCase.setUp(self)
-
input
= path.join(path.dirname(__file__), 'files/fraszka-do-anusie.xml')
- self.book = models.Book.from_xml_file(
input
)
+
xml
= path.join(path.dirname(__file__), 'files/fraszka-do-anusie.xml')
+ self.book = models.Book.from_xml_file(
xml
)
def test_gen_pdf(self):
self.book.build_pdf()
def test_gen_pdf(self):
self.book.build_pdf()
- self.assertTrue(path.exists(self.book.pdf_file.path))
+ book = models.Book.objects.get(pk=self.book.pk)
+ self.assertTrue(path.exists(book.pdf_file.path))
def test_gen_pdf_parent(self):
"""This book contains a child."""
def test_gen_pdf_parent(self):
"""This book contains a child."""
-
input
= path.join(path.dirname(__file__), "files/fraszki.xml")
- parent = models.Book.from_xml_file(
input
)
+
xml
= path.join(path.dirname(__file__), "files/fraszki.xml")
+ parent = models.Book.from_xml_file(
xml
)
parent.build_pdf()
parent.build_pdf()
+ parent = models.Book.objects.get(pk=parent.pk)
self.assertTrue(path.exists(parent.pdf_file.path))
def test_custom_pdf(self):
self.assertTrue(path.exists(parent.pdf_file.path))
def test_custom_pdf(self):
- out = models.get_dynamic_path(None, 'test-custom', ext='pdf')
+ from catalogue.tasks import build_custom_pdf
+ from catalogue.utils import get_dynamic_path
+ out = get_dynamic_path(None, 'test-custom', ext='pdf')
absoulute_path = path.join(settings.MEDIA_ROOT, out)
if not path.exists(path.dirname(absoulute_path)):
makedirs(path.dirname(absoulute_path))
absoulute_path = path.join(settings.MEDIA_ROOT, out)
if not path.exists(path.dirname(absoulute_path)):
makedirs(path.dirname(absoulute_path))
- self.book.build_pdf(customizations=['nofootnotes', '13pt', 'a4paper'], file_name=out)
+ build_custom_pdf(self.book.id,
+ customizations=['nofootnotes', '13pt', 'a4paper'], file_name=out)
self.assertTrue(path.exists(absoulute_path))
self.assertTrue(path.exists(absoulute_path))