X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/e6adf6ced68d667429975110f2d1a1bd9c8d79b6..a8a47f7846509d22b123f4ab9cfdd7e65ac0d32e:/paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 249b6e4..2787287 100644
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -15,7 +15,8 @@ import paperdoorknob
 from testing.fakeserver import FakeGlowficServer
 from domfilter import ApplyDOMFilters
 from fetch import DirectFetcher, FakeFetcher, Fetcher
-from images import ImageStore
+from glowfic import ContentOnlyLayout, BelowIconLayout
+from images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 
@@ -37,19 +38,25 @@ class BaseTestProcess(ABC):
         spec = Spec(
             self.url(),
             self.fetcher(),
-            ImageStore('is', self.fetcher()),
+            FakeImageStore(),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            PandocTexifier('pandoc'),
+            ContentOnlyLayout(PandocTexifier('pandoc')),
             'margin=20mm',
             buf)
         paperdoorknob.process(spec)
         assert buf.getvalue() == b'''\\documentclass{article}
+\\usepackage{graphicx}
+\\usepackage{varwidth}
+\\usepackage{wrapstuff}
 \\usepackage[margin=20mm]{geometry}
 \\begin{document}
 This is glowfic
+
 You \\emph{sure}?
+
 Pretty sure.
+
 \\end{document}
 '''
 
@@ -60,10 +67,10 @@ Pretty sure.
         spec = Spec(
             self.url(),
             self.fetcher(),
-            ImageStore('is', self.fetcher()),
+            FakeImageStore(),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            texifier,
+            ContentOnlyLayout(texifier),
             None,
             buf)
         paperdoorknob.process(spec)
@@ -73,10 +80,10 @@ Pretty sure.
             spec = Spec(
                 self.url(),
                 self.fetcher(),
-                ImageStore('is', self.fetcher()),
+                FakeImageStore(),
                 lambda x: x,
                 lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-                PandocTexifier('pandoc'),
+                BelowIconLayout(PandocTexifier('pandoc'), 20),
                 None,
                 out)
             paperdoorknob.process(spec)
@@ -105,7 +112,7 @@ class TestProcessFromFakeFetcher(BaseTestProcess, unittest.TestCase):
 
     def fetcher(self) -> Fetcher:
         with open('testdata/this-is-glowfic.html', 'rb') as f:
-            return FakeFetcher({'fic': f.read(9999)})
+            return FakeFetcher({'fic?view=flat': f.read(9999)})
 
 
 if __name__ == '__main__':