diff --git a/yesod-test/ChangeLog.md b/yesod-test/ChangeLog.md index 540a776f..1b135213 100644 --- a/yesod-test/ChangeLog.md +++ b/yesod-test/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.5.4.1 + +* Compilation fix for GHC 7.8 + ## 1.5.4 * yesod-test: add getLocation test helper. [#1314](https://github.com/yesodweb/yesod/pull/1314) diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs index 4b164599..9764ebf7 100644 --- a/yesod-test/Yesod/Test.hs +++ b/yesod-test/Yesod/Test.hs @@ -146,6 +146,7 @@ import qualified Blaze.ByteString.Builder as Builder import Data.Time.Clock (getCurrentTime) import Control.Applicative ((<$>)) import Text.Show.Pretty (ppShow) +import Data.Monoid (mempty) -- | The state used in a single test case defined using 'yit' -- @@ -772,7 +773,7 @@ getLocation = do where decodePath b = let (x, y) = BS8.break (=='?') b in (H.decodePathSegments x, unJust <$> H.parseQueryText y) unJust (a, Just b) = (a, b) - unJust (a, Nothing) = (a, mempty) + unJust (a, Nothing) = (a, Data.Monoid.mempty) -- | Sets the HTTP method used by the request. -- diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index e17c89dc..fd1d90e6 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -1,5 +1,5 @@ name: yesod-test -version: 1.5.4 +version: 1.5.4.1 license: MIT license-file: LICENSE author: Nubis