Reduce the number of places we keep our version number: 3 → 2

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 14f6dd9cde0057e459c3fa7bd961c1fdf02fc436..2787287eb8575145f15d0679582bda386edfe546 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -13,7 +13,10 @@ 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 images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 
@@ -30,31 +33,30 @@ class BaseTestProcess(ABC):
     def fetcher(self) -> Fetcher:
         raise NotImplementedError()
 
-    def testReplies(self) -> None:
-        replies = paperdoorknob.replies(
-            paperdoorknob.clean(
-                paperdoorknob.parse(
-                    self.fetcher().fetch(
-                        self.url()))))
-        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,
-            PandocTexifier('pandoc'),
+            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
+            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}
 '''
 
@@ -62,7 +64,15 @@ Pretty sure.
         texifier = VerifyingTexifier(
             PandocTexifier('pandoc'), DirectTexifier())
         buf = io.BytesIO()
-        spec = Spec(self.url(), self.fetcher(), lambda x: x, texifier, buf)
+        spec = Spec(
+            self.url(),
+            self.fetcher(),
+            FakeImageStore(),
+            lambda x: x,
+            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
+            ContentOnlyLayout(texifier),
+            None,
+            buf)
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
@@ -70,8 +80,11 @@ Pretty sure.
             spec = Spec(
                 self.url(),
                 self.fetcher(),
+                FakeImageStore(),
                 lambda x: x,
-                PandocTexifier('pandoc'),
+                lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
+                BelowIconLayout(PandocTexifier('pandoc'), 20),
+                None,
                 out)
             paperdoorknob.process(spec)
         subprocess.run(['pdflatex', 'test.tex'],
@@ -99,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__':