X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/b254976424d0f56fab14f8897dade345ce46a2d1..30b145cc4660ae5d86bd0de88e373d3107ba54d5:/paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index c423282..571dda6 100644
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -35,14 +35,17 @@ class BaseTestProcess(ABC):
 
     def testProcess(self) -> None:
         buf = io.BytesIO()
+        texifier = PandocTexifier('pandoc')
         spec = Spec(
             self.url(),
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             lambda x: None,
+            texifier,
             lambda x: x,
-            ContentOnlyLayout(PandocTexifier('pandoc')),
+            20,
+            ContentOnlyLayout,
             'margin=20mm',
             buf,
             lambda _: None)
@@ -50,13 +53,10 @@ class BaseTestProcess(ABC):
         assert re.match(br'''\\documentclass{article}
 (\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}
-\\newcommand{\\href}\[2\]{#2\\footnote{#1}}
-This is \\href{https://glowfic.com}{glowfic}
-
-You \\emph{sure}\?
-
-Pretty sure.
-
+(.|\n)*
+\\glowhead{}{}{}{}This is \\href{https://glowfic.com}{glowfic}
+\\glowhead{}{}{}{}You \\emph{sure}\?
+\\glowhead{}{}{}{}Pretty sure.
 \\end{document}
 ''', buf.getvalue())
 
@@ -70,14 +70,17 @@ Pretty sure.
             FakeImageStore(),
             lambda x: x,
             lambda x: None,
+            texifier,
             lambda x: x,
-            ContentOnlyLayout(texifier),
+            20,
+            ContentOnlyLayout,
             None,
             buf,
             lambda _: None)
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
+        texifier = PandocTexifier('pandoc')
         with open("test.tex", 'wb') as out:
             spec = Spec(
                 self.url(),
@@ -85,8 +88,10 @@ Pretty sure.
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: None,
+                texifier,
                 lambda x: x,
-                BesideIconLayout(PandocTexifier('pandoc'), 20),
+                20,
+                BesideIconLayout,
                 None,
                 out,
                 lambda _: None)
@@ -116,7 +121,8 @@ class TestProcessFromFakeFetcher(BaseTestProcess, unittest.TestCase):
 
     def fetcher(self) -> Fetcher:
         with open('testdata/this-is-glowfic.html', 'rb') as f:
-            return FakeFetcher({'fic?view=flat': f.read(9999)})
+            html = f.read(9999)
+            return FakeFetcher({'fic': html, 'fic?view=flat': html})
 
 
 if __name__ == '__main__':