Don't uselessly repeat preamble in test

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 612ee8d1c4cad8b054e089308be39ec771cd9304..61c8e6a77b6450054af5dcfc9d313efbc06ef1c1 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -8,14 +8,14 @@
 from abc import ABC, abstractmethod
 import unittest
 import io
+import re
 import subprocess
 
 import paperdoorknob
 
 from testing.fakeserver import FakeGlowficServer
-from domfilter import ApplyDOMFilters
 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
@@ -40,27 +40,25 @@ class BaseTestProcess(ABC):
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
-            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
+            lambda x: None,
+            lambda x: x,
             ContentOnlyLayout(PandocTexifier('pandoc')),
             'margin=20mm',
-            buf)
+            buf,
+            lambda _: None)
         paperdoorknob.process(spec)
-        assert buf.getvalue() == b'''\\documentclass{article}
-\\usepackage{graphicx}
-\\usepackage{wrapfig}
-\\usepackage[margin=20mm]{geometry}
+        assert re.match(br'''\\documentclass{article}
+(\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}
-This is glowfic
-
-\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
-
-You \\emph{sure}?
+.*
+This is \\href{https://glowfic.com}{glowfic}
 
-\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
+You \\emph{sure}\?
 
 Pretty sure.
+
 \\end{document}
-'''
+''', buf.getvalue())
 
     def testDirectTexifier(self) -> None:
         texifier = VerifyingTexifier(
@@ -71,10 +69,12 @@ Pretty sure.
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
-            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
+            lambda x: None,
+            lambda x: x,
             ContentOnlyLayout(texifier),
             None,
-            buf)
+            buf,
+            lambda _: None)
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
@@ -84,10 +84,12 @@ Pretty sure.
                 self.fetcher(),
                 FakeImageStore(),
                 lambda x: x,
-                lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-                BelowIconLayout(PandocTexifier('pandoc'), 20),
+                lambda x: None,
+                lambda x: x,
+                BesideIconLayout(PandocTexifier('pandoc'), 20),
                 None,
-                out)
+                out,
+                lambda _: None)
             paperdoorknob.process(spec)
         subprocess.run(['pdflatex', 'test.tex'],
                        stdin=subprocess.DEVNULL, check=True)
@@ -114,7 +116,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__':