Lines between chunks

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 249b6e42e936fa5f60a18e021c133dc824ca15a6..612ee8d1c4cad8b054e089308be39ec771cd9304 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -15,7 +15,8 @@ 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 images import ImageStore
+from glowfic import ContentOnlyLayout, BelowIconLayout
+from images import FakeImageStore

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


@@ -37,18 +38,26 @@ class BaseTestProcess(ABC):
         spec = Spec(
             self.url(),
             self.fetcher(),
         spec = Spec(
             self.url(),
             self.fetcher(),

-            ImageStore('is', self.fetcher()),
+            FakeImageStore(),

             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
             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{graphicx}
+\\usepackage{wrapfig}

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

+
+\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
+

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

+
+\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
+

 Pretty sure.
 \\end{document}
 '''
 Pretty sure.
 \\end{document}
 '''


@@ -60,10 +69,10 @@ Pretty sure.
         spec = Spec(
             self.url(),
             self.fetcher(),
         spec = Spec(
             self.url(),
             self.fetcher(),

-            ImageStore('is', self.fetcher()),
+            FakeImageStore(),

             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
             lambda x: x,
             lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),

-            texifier,
+            ContentOnlyLayout(texifier),

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


@@ -73,10 +82,10 @@ Pretty sure.
             spec = Spec(
                 self.url(),
                 self.fetcher(),
             spec = Spec(
                 self.url(),
                 self.fetcher(),

-                ImageStore('is', self.fetcher()),
+                FakeImageStore(),

                 lambda x: x,
                 lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
                 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)