Put Texifier in spec

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 8527dd3144f91d91a42b88995c65e5b78837e1e2..28408d6138003d0ce616bc0e034cb9f9d52a250f 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -15,7 +15,7 @@ import paperdoorknob
 
 from testing.fakeserver import FakeGlowficServer
 from fetch import DirectFetcher, FakeFetcher, Fetcher
-from glowfic import ContentOnlyLayout, BelowIconLayout
+from glowfic import ContentOnlyLayout, BesideIconLayout
 from images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
@@ -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(texifier),
             'margin=20mm',
             buf,
             lambda _: None)
@@ -50,7 +53,8 @@ class BaseTestProcess(ABC):
         assert re.match(br'''\\documentclass{article}
 (\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}
-This is glowfic
+(.|\n)*
+This is \\href{https://glowfic.com}{glowfic}
 
 You \\emph{sure}\?
 
@@ -69,7 +73,9 @@ Pretty sure.
             FakeImageStore(),
             lambda x: x,
             lambda x: None,
+            texifier,
             lambda x: x,
+            20,
             ContentOnlyLayout(texifier),
             None,
             buf,
@@ -77,6 +83,7 @@ Pretty sure.
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
+        texifier = PandocTexifier('pandoc')
         with open("test.tex", 'wb') as out:
             spec = Spec(
                 self.url(),
@@ -84,8 +91,10 @@ Pretty sure.
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: None,
+                texifier,
                 lambda x: x,
-                BelowIconLayout(PandocTexifier('pandoc'), 20),
+                20,
+                BesideIconLayout(texifier),
                 None,
                 out,
                 lambda _: None)