image filenames: Drop ? and following query parameters

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 4291bb4e613659b29ec21eecd77c60777f6e97a6..2787287eb8575145f15d0679582bda386edfe546 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -15,6 +15,7 @@ import paperdoorknob
 from testing.fakeserver import FakeGlowficServer
 from domfilter import ApplyDOMFilters
 from fetch import DirectFetcher, FakeFetcher, Fetcher
 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
 from images import FakeImageStore
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier


@@ -40,17 +41,22 @@ class BaseTestProcess(ABC):
             FakeImageStore(),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
             FakeImageStore(),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),

-            PandocTexifier('pandoc'),
+            ContentOnlyLayout(PandocTexifier('pandoc')),

             'margin=20mm',
             buf)
         paperdoorknob.process(spec)
         assert buf.getvalue() == b'''\\documentclass{article}
             'margin=20mm',
             buf)
         paperdoorknob.process(spec)
         assert buf.getvalue() == b'''\\documentclass{article}

-\\usepackage{wrapfig}
+\\usepackage{graphicx}
+\\usepackage{varwidth}
+\\usepackage{wrapstuff}

 \\usepackage[margin=20mm]{geometry}
 \\begin{document}
 This is glowfic
 \\usepackage[margin=20mm]{geometry}
 \\begin{document}
 This is glowfic

+

 You \\emph{sure}?
 You \\emph{sure}?

+

 Pretty sure.
 Pretty sure.

+

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


@@ -64,7 +70,7 @@ Pretty sure.
             FakeImageStore(),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
             FakeImageStore(),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),

-            texifier,
+            ContentOnlyLayout(texifier),

             None,
             buf)
         paperdoorknob.process(spec)
             None,
             buf)
         paperdoorknob.process(spec)


@@ -77,7 +83,7 @@ Pretty sure.
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),

-                PandocTexifier('pandoc'),
+                BelowIconLayout(PandocTexifier('pandoc'), 20),

                 None,
                 out)
             paperdoorknob.process(spec)
                 None,
                 out)
             paperdoorknob.process(spec)


@@ -106,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__':