Fetch the non-flat view to get the next-thread link

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 8527dd3144f91d91a42b88995c65e5b78837e1e2..571dda6847abb40b59855b9c90d81d28ce12f95a 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -15,7 +15,7 @@ import paperdoorknob
 
 from testing.fakeserver import FakeGlowficServer
 from fetch import DirectFetcher, FakeFetcher, Fetcher
 
 from testing.fakeserver import FakeGlowficServer
 from fetch import DirectFetcher, FakeFetcher, Fetcher

-from glowfic import ContentOnlyLayout, BelowIconLayout
+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


@@ -35,14 +35,17 @@ class BaseTestProcess(ABC):
 
     def testProcess(self) -> None:
         buf = io.BytesIO()
 
     def testProcess(self) -> None:
         buf = io.BytesIO()

+        texifier = PandocTexifier('pandoc')

         spec = Spec(
             self.url(),
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             lambda x: None,
         spec = Spec(
             self.url(),
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             lambda x: None,

+            texifier,

             lambda x: x,
             lambda x: x,

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

             'margin=20mm',
             buf,
             lambda _: None)
             'margin=20mm',
             buf,
             lambda _: None)


@@ -50,12 +53,10 @@ class BaseTestProcess(ABC):
         assert re.match(br'''\\documentclass{article}
 (\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}
         assert re.match(br'''\\documentclass{article}
 (\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}

-This is glowfic
-
-You \\emph{sure}\?
-
-Pretty sure.
-
+(.|\n)*
+\\glowhead{}{}{}{}This is \\href{https://glowfic.com}{glowfic}
+\\glowhead{}{}{}{}You \\emph{sure}\?
+\\glowhead{}{}{}{}Pretty sure.

 \\end{document}
 ''', buf.getvalue())
 
 \\end{document}
 ''', buf.getvalue())
 


@@ -69,14 +70,17 @@ Pretty sure.
             FakeImageStore(),
             lambda x: x,
             lambda x: None,
             FakeImageStore(),
             lambda x: x,
             lambda x: None,

+            texifier,

             lambda x: x,
             lambda x: x,

-            ContentOnlyLayout(texifier),
+            20,
+            ContentOnlyLayout,

             None,
             buf,
             lambda _: None)
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
             None,
             buf,
             lambda _: None)
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:

+        texifier = PandocTexifier('pandoc')

         with open("test.tex", 'wb') as out:
             spec = Spec(
                 self.url(),
         with open("test.tex", 'wb') as out:
             spec = Spec(
                 self.url(),


@@ -84,8 +88,10 @@ Pretty sure.
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: None,
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: None,

+                texifier,

                 lambda x: x,
                 lambda x: x,

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

                 None,
                 out,
                 lambda _: None)
                 None,
                 out,
                 lambda _: None)


@@ -115,7 +121,8 @@ 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?view=flat': f.read(9999)})
+            html = f.read(9999)
+            return FakeFetcher({'fic': html, 'fic?view=flat': html})

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':