Remove no-longer-needed DOMFilters NoEdit and NoFooter

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 7ceb3eaf2cd77f7f98f0a28b6e1886baa1d801b1..bafce174a1f0af81b46796297cd813d5adf14c57 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -8,13 +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 images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
@@ -39,19 +40,23 @@ class BaseTestProcess(ABC):
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
-            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            PandocTexifier('pandoc'),
+            lambda x: None,
+            lambda x: x,
+            ContentOnlyLayout(PandocTexifier('pandoc')),
             'margin=20mm',
             buf)
         paperdoorknob.process(spec)
-        assert buf.getvalue() == b'''\\documentclass{article}
-\\usepackage[margin=20mm]{geometry}
+        assert re.match(br'''\\documentclass{article}
+(\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}
 This is glowfic
-You \\emph{sure}?
+
+You \\emph{sure}\?
+
 Pretty sure.
+
 \\end{document}
-'''
+''', buf.getvalue())
 
     def testDirectTexifier(self) -> None:
         texifier = VerifyingTexifier(
@@ -62,8 +67,9 @@ Pretty sure.
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
-            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            texifier,
+            lambda x: None,
+            lambda x: x,
+            ContentOnlyLayout(texifier),
             None,
             buf)
         paperdoorknob.process(spec)
@@ -75,8 +81,9 @@ Pretty sure.
                 self.fetcher(),
                 FakeImageStore(),
                 lambda x: x,
-                lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-                PandocTexifier('pandoc'),
+                lambda x: None,
+                lambda x: x,
+                BelowIconLayout(PandocTexifier('pandoc'), 20),
                 None,
                 out)
             paperdoorknob.process(spec)
@@ -105,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__':