X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/f1dec72014657ab33bffa8f68064d85cc862ea65..dbda64b551aaeffa4f01779a52c7ec68b1fffa98:/paperdoorknob_test.py?ds=sidebyside

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 4cead97..baf7945 100644
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -8,9 +8,12 @@
 import unittest
 import io
 import subprocess
+
 import paperdoorknob
+
 from testing.fakeserver import FakeGlowficServer
 from fetch import DirectFetcher
+from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 
 TIMEOUT = 8
@@ -31,11 +34,14 @@ class TestPaperDoorknob(unittest.TestCase):
                              ["This is glowfic", "You sure?", "Pretty sure."])
 
     def testProcess(self) -> None:
-        texifier = PandocTexifier('pandoc')
         with DirectFetcher(TIMEOUT) as f:
             buf = io.BytesIO()
-            paperdoorknob.process(
-                f"http://localhost:{self._port}", f, texifier, buf)
+            spec = Spec(
+                f"http://localhost:{self._port}",
+                f,
+                PandocTexifier('pandoc'),
+                buf)
+            paperdoorknob.process(spec)
             self.assertEqual(buf.getvalue(), b'''\\documentclass{article}
 \\begin{document}
 This is glowfic
@@ -49,17 +55,20 @@ Pretty sure.
             PandocTexifier('pandoc'), DirectTexifier())
         with DirectFetcher(TIMEOUT) as f:
             buf = io.BytesIO()
-            paperdoorknob.process(
-                f"http://localhost:{self._port}", f, texifier, buf)
+            spec = Spec(f"http://localhost:{self._port}", f, texifier, buf)
+            paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
-        texifier = PandocTexifier('pandoc')
         with DirectFetcher(TIMEOUT) as f:
             with open("test.tex", 'wb') as out:
-                paperdoorknob.process(
-                    f"http://localhost:{self._port}", f, texifier, out)
-            subprocess.run(['pdflatex', 'test.tex'],
-                           stdin=subprocess.DEVNULL, check=True)
+                spec = Spec(
+                    f"http://localhost:{self._port}",
+                    f,
+                    PandocTexifier('pandoc'),
+                    out)
+                paperdoorknob.process(spec)
+        subprocess.run(['pdflatex', 'test.tex'],
+                       stdin=subprocess.DEVNULL, check=True)
 
 
 if __name__ == '__main__':