From f3881821328fae8cba848627f1caf2086121c903 Mon Sep 17 00:00:00 2001 From: Alexander Batischev Date: Wed, 30 Dec 2020 22:50:58 +0300 Subject: 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 --- hakyll.cabal | 2 -- tests/Hakyll/Web/Pandoc/Biblio/Tests.hs | 5 ----- tests/data/biblio/biblio01-pre-pandoc-2.11.3.golden | 16 ---------------- tests/data/biblio/biblio01.golden | 2 +- 4 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 tests/data/biblio/biblio01-pre-pandoc-2.11.3.golden 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 @@ - - - - - This page cites a paper. - - -

This page cites a paper.

-

I would like to cite one of my favourite papers (Meijer, Fokkinga, and Paterson 1991) here.

-
-
-Meijer, Erik, Maarten Fokkinga, and Ross Paterson. 1991. “Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire.” In Conference on Functional Programming Languages and Computer Architecture, 124–44. Springer. -
-
- - 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 @@

I would like to cite one of my favourite papers (Meijer, Fokkinga, and Paterson 1991) here.

-

Meijer, Erik, Maarten Fokkinga, and Ross Paterson. 1991. “Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire.” In Conference on Functional Programming Languages and Computer Architecture, 124–44. Springer.

+Meijer, Erik, Maarten Fokkinga, and Ross Paterson. 1991. “Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire.” In Conference on Functional Programming Languages and Computer Architecture, 124–44. Springer.
-- cgit v1.2.3