summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Batischev <eual.jp@gmail.com>2020-12-30 22:50:58 +0300
committerGitHub <noreply@github.com>2020-12-30 22:50:58 +0300
commitf3881821328fae8cba848627f1caf2086121c903 (patch)
tree695e0bb91caa15915de8935e3da4bd9db6ba66d2
parent87e93c6c95b86b435b532286e07b0a9b896aef8f (diff)
downloadhakyll-f3881821328fae8cba848627f1caf2086121c903.tar.gz
Revert "Fix golden test failing with pandoc >= 2.11.3 (#829)" (#830)
This reverts commit 87e93c6c95b86b435b532286e07b0a9b896aef8f. I screwed up with that one: the change in behaviour was a regression[1] in Pandoc, and I shouldn't have papered over it. It's fairly unlikely that someone would build Hakyll's test suite with one of the two Pandoc versions that regressed, so I simply revert my earlier commit. 1. https://github.com/jgm/pandoc/issues/6966
-rw-r--r--hakyll.cabal2
-rw-r--r--tests/Hakyll/Web/Pandoc/Biblio/Tests.hs5
-rw-r--r--tests/data/biblio/biblio01-pre-pandoc-2.11.3.golden16
-rw-r--r--tests/data/biblio/biblio01.golden2
4 files changed, 1 insertions, 24 deletions
diff --git a/hakyll.cabal b/hakyll.cabal
index d8f44f7..66eec1d 100644
--- a/hakyll.cabal
+++ b/hakyll.cabal
@@ -299,8 +299,6 @@ Test-suite hakyll-tests
Other-modules:
Hakyll.Web.Pandoc.Biblio.Tests
Hakyll.Web.Pandoc.FileType.Tests
- Build-Depends:
- pandoc >= 2.11 && < 2.12
Cpp-options:
-DUSE_PANDOC
diff --git a/tests/Hakyll/Web/Pandoc/Biblio/Tests.hs b/tests/Hakyll/Web/Pandoc/Biblio/Tests.hs
index 9135086..fb98f08 100644
--- a/tests/Hakyll/Web/Pandoc/Biblio/Tests.hs
+++ b/tests/Hakyll/Web/Pandoc/Biblio/Tests.hs
@@ -1,6 +1,5 @@
--------------------------------------------------------------------------------
{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE CPP #-}
module Hakyll.Web.Pandoc.Biblio.Tests
( tests
) where
@@ -37,11 +36,7 @@ goldenTest01 :: TestTree
goldenTest01 =
goldenVsString
"biblio01"
-#if MIN_VERSION_pandoc(2,11,3)
(goldenTestsDataDir </> "biblio01.golden")
-#else
- (goldenTestsDataDir </> "biblio01-pre-pandoc-2.11.3.golden")
-#endif
(do
-- Code lifted from https://github.com/jaspervdj/hakyll-citeproc-example.
logger <- Logger.new Logger.Error
diff --git a/tests/data/biblio/biblio01-pre-pandoc-2.11.3.golden b/tests/data/biblio/biblio01-pre-pandoc-2.11.3.golden
deleted file mode 100644
index ace1e76..0000000
--- a/tests/data/biblio/biblio01-pre-pandoc-2.11.3.golden
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>This page cites a paper.</title>
- </head>
- <body>
- <h1>This page cites a paper.</h1>
- <p>I would like to cite one of my favourite papers <span class="citation" data-cites="meijer1991functional">(Meijer, Fokkinga, and Paterson 1991)</span> here.</p>
-<div id="refs" class="references csl-bib-body hanging-indent" role="doc-bibliography">
-<div id="ref-meijer1991functional" class="csl-entry" role="doc-biblioentry">
-Meijer, Erik, Maarten Fokkinga, and Ross Paterson. 1991. <span>“Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire.”</span> In <em>Conference on Functional Programming Languages and Computer Architecture</em>, 124–44. Springer.
-</div>
-</div>
- </body>
-</html>
diff --git a/tests/data/biblio/biblio01.golden b/tests/data/biblio/biblio01.golden
index 9053456..ace1e76 100644
--- a/tests/data/biblio/biblio01.golden
+++ b/tests/data/biblio/biblio01.golden
@@ -9,7 +9,7 @@
<p>I would like to cite one of my favourite papers <span class="citation" data-cites="meijer1991functional">(Meijer, Fokkinga, and Paterson 1991)</span> here.</p>
<div id="refs" class="references csl-bib-body hanging-indent" role="doc-bibliography">
<div id="ref-meijer1991functional" class="csl-entry" role="doc-biblioentry">
-<p>Meijer, Erik, Maarten Fokkinga, and Ross Paterson. 1991. <span>“Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire.”</span> In <em>Conference on Functional Programming Languages and Computer Architecture</em>, 124–44. Springer.</p>
+Meijer, Erik, Maarten Fokkinga, and Ross Paterson. 1991. <span>“Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire.”</span> In <em>Conference on Functional Programming Languages and Computer Architecture</em>, 124–44. Springer.
</div>
</div>
</body>