Progress indicator

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index a89e8bb37c98d6f1df4c0bc22097c9069dbc3fd6..bafce174a1f0af81b46796297cd813d5adf14c57 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -8,12 +8,12 @@
 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 glowfic import ContentOnlyLayout, BelowIconLayout
 from images import FakeImageStore
 from fetch import DirectFetcher, FakeFetcher, Fetcher
 from glowfic import ContentOnlyLayout, BelowIconLayout
 from images import FakeImageStore


@@ -40,27 +40,23 @@ class BaseTestProcess(ABC):
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,

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

             ContentOnlyLayout(PandocTexifier('pandoc')),
             'margin=20mm',
             buf)
         paperdoorknob.process(spec)
             ContentOnlyLayout(PandocTexifier('pandoc')),
             'margin=20mm',
             buf)
         paperdoorknob.process(spec)

-        assert buf.getvalue() == b'''\\documentclass{article}
-\\usepackage{graphicx}
-\\usepackage{wrapstuff}
-\\usepackage[margin=20mm]{geometry}
+        assert re.match(br'''\\documentclass{article}
+(\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}

 \\begin{document}
 This is glowfic
 
 \\begin{document}
 This is glowfic
 

-\\wrapstuffclear\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
-
-You \\emph{sure}?
-
-\\wrapstuffclear\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
+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(


@@ -71,7 +67,8 @@ Pretty sure.
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,

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

             ContentOnlyLayout(texifier),
             None,
             buf)
             ContentOnlyLayout(texifier),
             None,
             buf)


@@ -84,7 +81,8 @@ Pretty sure.
                 self.fetcher(),
                 FakeImageStore(),
                 lambda x: x,
                 self.fetcher(),
                 FakeImageStore(),
                 lambda x: x,

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

                 BelowIconLayout(PandocTexifier('pandoc'), 20),
                 None,
                 out)
                 BelowIconLayout(PandocTexifier('pandoc'), 20),
                 None,
                 out)


@@ -114,7 +112,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__':