X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/8be20b9d36c49271ed392038750dfba981c283b6..d59b46dbd038d61afd875c04e6dcc39e9395f414:/paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index aa50340..c1f8b60 100644
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -15,6 +15,8 @@ import paperdoorknob
 from testing.fakeserver import FakeGlowficServer
 from domfilter import ApplyDOMFilters
 from fetch import DirectFetcher, FakeFetcher, Fetcher
+from glowfic import ContentOnlyLayout, BelowIconLayout
+from images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 
@@ -31,27 +33,22 @@ class BaseTestProcess(ABC):
     def fetcher(self) -> Fetcher:
         raise NotImplementedError()
 
-    def testReplies(self) -> None:
-        replies = list(paperdoorknob.replies(
-            paperdoorknob.parse(self.fetcher().fetch(self.url()))))
-        for r in replies:
-            ApplyDOMFilters('NoEdit,NoFooter', r)
-        assert [r.text.strip() for r in replies] == [
-            "This is glowfic",
-            "You sure?",
-            "Pretty sure."]
-
     def testProcess(self) -> None:
         buf = io.BytesIO()
         spec = Spec(
             self.url(),
             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{wrapfig}
+\\usepackage[margin=20mm]{geometry}
 \\begin{document}
 This is glowfic
 You \\emph{sure}?
@@ -66,9 +63,11 @@ Pretty sure.
         spec = Spec(
             self.url(),
             self.fetcher(),
+            FakeImageStore(),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            texifier,
+            ContentOnlyLayout(texifier),
+            None,
             buf)
         paperdoorknob.process(spec)
 
@@ -77,9 +76,11 @@ Pretty sure.
             spec = Spec(
                 self.url(),
                 self.fetcher(),
+                FakeImageStore(),
                 lambda x: x,
                 lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-                PandocTexifier('pandoc'),
+                BelowIconLayout(PandocTexifier('pandoc')),
+                None,
                 out)
             paperdoorknob.process(spec)
         subprocess.run(['pdflatex', 'test.tex'],