Rename: html → dom

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 7ceb3eaf2cd77f7f98f0a28b6e1886baa1d801b1..c4232829a9b41a940728cce880bc87fcee4a4613 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -8,13 +8,14 @@
 from abc import ABC, abstractmethod
 import unittest
 import io
 from abc import ABC, abstractmethod
 import unittest
 import io

+import re

 import subprocess
 
 import paperdoorknob
 
 from testing.fakeserver import FakeGlowficServer
 import subprocess
 
 import paperdoorknob
 
 from testing.fakeserver import FakeGlowficServer

-from domfilter import ApplyDOMFilters

 from fetch import DirectFetcher, FakeFetcher, Fetcher
 from fetch import DirectFetcher, FakeFetcher, Fetcher

+from glowfic import ContentOnlyLayout, BesideIconLayout

 from images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 from images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier


@@ -39,19 +40,25 @@ class BaseTestProcess(ABC):
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             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',
             'margin=20mm',

-            buf)
+            buf,
+            lambda _: None)

         paperdoorknob.process(spec)
         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}
 \\begin{document}

-This is glowfic
-You \\emph{sure}?
+\\newcommand{\\href}\[2\]{#2\\footnote{#1}}
+This is \\href{https://glowfic.com}{glowfic}
+
+You \\emph{sure}\?
+

 Pretty sure.
 Pretty sure.

+

 \\end{document}
 \\end{document}

-'''
+''', buf.getvalue())

 
     def testDirectTexifier(self) -> None:
         texifier = VerifyingTexifier(
 
     def testDirectTexifier(self) -> None:
         texifier = VerifyingTexifier(


@@ -62,10 +69,12 @@ Pretty sure.
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,

-            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            texifier,
+            lambda x: None,
+            lambda x: x,
+            ContentOnlyLayout(texifier),

             None,
             None,

-            buf)
+            buf,
+            lambda _: None)

         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:


@@ -75,10 +84,12 @@ Pretty sure.
                 self.fetcher(),
                 FakeImageStore(),
                 lambda x: x,
                 self.fetcher(),
                 FakeImageStore(),
                 lambda x: x,

-                lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-                PandocTexifier('pandoc'),
+                lambda x: None,
+                lambda x: x,
+                BesideIconLayout(PandocTexifier('pandoc'), 20),

                 None,
                 None,

-                out)
+                out,
+                lambda _: None)

             paperdoorknob.process(spec)
         subprocess.run(['pdflatex', 'test.tex'],
                        stdin=subprocess.DEVNULL, check=True)
             paperdoorknob.process(spec)
         subprocess.run(['pdflatex', 'test.tex'],
                        stdin=subprocess.DEVNULL, check=True)


@@ -105,7 +116,7 @@ class TestProcessFromFakeFetcher(BaseTestProcess, unittest.TestCase):
 
     def fetcher(self) -> Fetcher:
         with open('testdata/this-is-glowfic.html', 'rb') as f:
 
     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__':
 
 
 if __name__ == '__main__':